fabulator-exhibit 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.0.4 2010-10-26
+
+* 3 major enhancement:
+  * Works with Fabulator 0.0.9 and later
+  * Moved Fabulator::Exhibit::Actions::Lib to Fabulator::Exhibit::Lib
+  * Provides markup for exhibits in Fabulator views
+
 === 0.0.3 2010-09-07
 
 * 1 major enhancement:

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gem.email = "jgsmith@tamu.edu"
     gem.homepage = "http://github.com/jgsmith/ruby-fabulator-exhibit"
     gem.authors = ["James Smith"]
-    gem.add_dependency('fabulator', '>= 0.0.7')
+    gem.add_dependency('fabulator', '>= 0.0.9')
     gem.add_dependency('uuid', '>= 2.1.0')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/features/simple-database.feature

@@ -13,6 +13,9 @@ Feature: Simple database items
             <ex:item ex:id="'foo'" ex:type="fooType" ex:label="'fooLabel'">
               <ex:value ex:name="bar" f:select="'baz'" />
             </ex:item>
+            <ex:item ex:id="'bar'" ex:type="fooType" ex:label="'barLabel'">
+              <ex:value ex:name="bar" f:select="'bat'" />
+            </ex:item>
           </ex:database>
           <ex:database>
             <f:value f:path="/f" f:select="ex:item('foo')" />
@@ -21,9 +24,10 @@ Feature: Simple database items
         </f:application>
       """
      And using the 'test' database
-    Then there should be 1 item
+    Then there should be 2 items
      And the item 'foo' should have type 'fooType'
      And the item 'foo' should have the label 'fooLabel'
      And the item 'foo' should have the property 'bar' as 'baz'
      And the expression (/f/bar) should equal ['baz']
      And the expression (/g/foo/bar) should equal ['baz']
+     And the expression (/g/bar/bar) should equal ['bat']

data/features/step_definitions/exhibit_steps.rb

@@ -3,22 +3,22 @@ Given /the '(.*)' database/ do |n|
 end
 
 Then /there should be (\d+) items?/ do |n|
-  db = Fabulator::Exhibit::Actions::Lib.fetch_database(@exhibit_db_nom)
+  db = Fabulator::Exhibit::Lib.fetch_database(@exhibit_db_nom)
   db[:items].size.should == n.to_i
 end
 
 Then /^the item '(.*)' should have type '(.+)'$/ do |id, type|
-  db = Fabulator::Exhibit::Actions::Lib.fetch_database(@exhibit_db_nom)
+  db = Fabulator::Exhibit::Lib.fetch_database(@exhibit_db_nom)
   db[:items][id]['type'].should == type
 end
 
 Then /^the item '(.*)' should have the label '(.*)'$/ do |id, label|
-  db = Fabulator::Exhibit::Actions::Lib.fetch_database(@exhibit_db_nom)
+  db = Fabulator::Exhibit::Lib.fetch_database(@exhibit_db_nom)
   db[:items][id]['label'].should == label
 end
 
 Then /^the item '(.*)' should have the property '(.*)' as '(.*)'$/ do |id, prop_name, prop_value|
-  db = Fabulator::Exhibit::Actions::Lib.fetch_database(@exhibit_db_nom)
+  db = Fabulator::Exhibit::Lib.fetch_database(@exhibit_db_nom)
   db[:items][id][prop_name].should == prop_value
 end
 

data/features/step_definitions/template_steps.rb

@@ -0,0 +1,72 @@
+Given /^the template$/ do |doc_xml|
+  @template_text = doc_xml
+end
+
+When /^I render the template$/ do
+  parser = Fabulator::Template::Parser.new
+  @template_result = parser.parse(@context, @template_text)
+  #puts @template_result.to_s
+end
+
+When /^I set the captions to:$/ do |caption_table|
+  captions = { }
+  caption_table.hashes.each do |h|
+    captions[h['path']] = h['caption']
+  end
+
+  @template_result.add_captions(captions)
+end
+
+When /^I set the defaults to:$/ do |caption_table|
+  captions = { }
+  ctx = @context.with_root(@context.root.anon_node(nil))
+  caption_table.hashes.each do |h|
+    ctx.set_value(h['path'], Fabulator::Expr::Literal.new(h['default']))
+  end
+
+  @template_result.add_default_values(ctx)
+end
+
+Then /^the rendered text should equal$/ do |doc|
+  r = @template_result.to_s
+ 
+  cmd = 'xmllint --c14n --nsclean -'
+  IO.popen(cmd, "r+") { |x|
+    x << r
+    x.close_write
+    r = x.readlines.join("")
+  }
+  IO.popen(cmd, "r+") { |x|
+    x << doc
+    x.close_write
+    doc = x.readlines.join("")
+  }
+
+  #@template_result.to_s.should == doc + "\n"
+  r = r.gsub(/xmlns(:\S+)?=['"][^'"]*['"]/, '').gsub(/\s+/, ' ').gsub(/\s+>/, '>').gsub(/>\s+</, ">\n<").gsub(/id=["']id\d+["']/, 'id=""')
+  doc = doc.gsub(/xmlns(:\S+)?=['"][^'"]*['"]/, '').gsub(/\s+/, ' ').gsub(/\s+>/, '>').gsub(/>\s+</, ">\n<").gsub(/id=["']id\d+["']/, 'id=""')
+  r.should == doc
+end
+
+Then /^the rendered html should equal$/ do |doc|
+  r = @template_result.to_html
+
+  cmd = 'xmllint --html --c14n --nsclean -'
+  IO.popen(cmd, "r+") { |x|
+    x << r
+    x.close_write
+    r = x.readlines.join("")
+  }
+  IO.popen(cmd, "r+") { |x|
+    x << doc
+    x.close_write
+    doc = x.readlines.join("")
+  }
+
+  #puts "html from template: #{r}"
+  #puts "html from doc     : #{doc}"
+
+  r = r.gsub(/xmlns(:\S+)?=['"][^'"]*['"]/, '').gsub(/\s+/, ' ').gsub(/\s+>/, '>').gsub(/>\s*</, ">\n<").gsub(/id=["']id\d+(-.*?)?["']/, 'id="id\1"')
+  doc = doc.gsub(/xmlns(:\S+)?=['"][^'"]*['"]/, '').gsub(/\s+/, ' ').gsub(/\s+>/, '>').gsub(/>\s*</, ">\n<").gsub(/id=["']id\d+(-.*?)?["']/, 'id="id\1"')
+  r.should == doc
+end

data/features/step_definitions/xml_steps.rb

@@ -7,11 +7,11 @@ Given /the statemachine/ do |doc_xml|
   @roots['data'] ||= @data
   @context ||= Fabulator::Expr::Context.new
   @context.root = @data
+  @compiler ||= Fabulator::Compiler.new
 
   @parser ||= Fabulator::Expr::Parser.new
   if @sm.nil?
-    @sm = Fabulator::Core::StateMachine.new
-    @sm.compile_xml(doc, @context)
+    @sm = @compiler.compile(doc)
   else
     @sm.compile_xml(doc, @context)
   end

data/features/support/env.rb

@@ -4,11 +4,12 @@ $: << File.expand_path(File.dirname(__FILE__))+'/../../lib'
 $: << File.expand_path(File.dirname(__FILE__))+'/../../../fabulator/lib'
 
 require 'fabulator'
+require 'fabulator/template'
 require 'fabulator/exhibit'
 require 'spec/expectations'
 require 'xml/libxml'
 
-Fabulator::Exhibit::Actions::Lib.class_eval do
+Fabulator::Exhibit::Lib.class_eval do
   def self.fetch_database(nom)
     @@dbs ||= { }
     @@dbs[nom] ||= { :types => {}, :items => {}, :properties => {} }

data/features/templates.feature

@@ -0,0 +1,82 @@
+@tmpl
+Feature: Templates
+
+  @nst
+  Scenario: Rendering markup with namespaces
+   Given a context
+     And the template
+       """
+<div xmlns="http://dh.tamu.edu/ns/fabulator/1.0#"
+     xmlns:ex="http://dh.tamu.edu/ns/fabulator/exhibit/1.0#"
+>
+  <ex:exhibit ex:database="00A">
+    <ex:collection ex:types="Point" />
+    <ex:map-view 
+       ex:center="42.4603,-71.3494" 
+       ex:zoom-level="10"
+       ex:select=".pointLatLong"
+    />
+    <ex:list-facet ex:select=".label">
+      <ex:caption>Names</ex:caption>
+    </ex:list-facet>
+    <ex:tile-view>
+      <ex:caption>Points</ex:caption>
+      <ex:lens ex:types="Point">
+        <ex:title><ex:value ex:select=".label" /></ex:title>
+        <ex:body>
+          <ex:property-list>
+            <ex:property ex:select=".label">
+              <ex:caption>Label</ex:caption>
+            </ex:property>
+            <ex:property ex:select=".pointLatLong">
+              <ex:caption>Lat/Long</ex:caption>
+            </ex:property>
+            <ex:property ex:select=".documents">
+              <ex:caption>Documents</ex:caption>
+            </ex:property>
+          </ex:property-list>
+        </ex:body>
+      </ex:lens>
+    </ex:tile-view>
+  </ex:exhibit>
+</div>
+       """
+   When I render the template
+   Then the rendered html should equal
+       """
+<div> 
+  <div class="fabulator-exhibit" source="00A" id="id" ex:exhibitlabel="">
+    <div ex:role="exhibit-collection" ex:itemtypes="Point"></div>
+    <div class="facets">
+      <div ex:role="facet" id="id" ex:expression=".label" ex:facetClass="List" ex:facetlabel="Names"></div>
+    </div>
+    <div class="views" id="id-views" ex:role="viewPanel">
+      <div ex:role="view" ex:viewclass="Map" id="id" ex:latlng=".pointLatLong" ex:center="42.4603,-71.3494" ex:zoom="10" ex:size="" ex:type="" ex:viewlabel="">
+      </div>
+      <div ex:role="view" class="view tile-view" ex:viewclass="Tile" id="id" ex:viewlabel="Points">
+        <div ex:role="lens" id="id" ex:itemtypes="Point" style="display: none;">
+          <div class="exhibit-lens-title"><span ex:content=".label"></span></div>
+          <div class="exhibit-lens-body">
+            <table class="exhibit-lens-properties">
+              <tbody>
+                <tr class="exhibit-lens-property">
+                  <td class="exhibit-lens-property-name">Label: </td>
+                  <td class="exhibit-lens-property-values"><span ex:content=".label"></span></td>
+                </tr>
+                <tr class="exhibit-lens-property">
+                  <td class="exhibit-lens-property-name">Lat/Long: </td>
+                  <td class="exhibit-lens-property-values"><span ex:content=".pointLatLong"></span></td>
+                </tr>
+                <tr class="exhibit-lens-property">
+                  <td class="exhibit-lens-property-name">Documents: </td>
+                  <td class="exhibit-lens-property-values"><span ex:content=".documents"></span></td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+       """

data/lib/fabulator/exhibit/actions/item.rb

@@ -21,9 +21,10 @@ module Fabulator
             db = @database.run(ctx).first.to_s
 
             items.each do |item|
-              info = Fabulator::Exhibit::Actions::Lib.accumulate_item_info do
-                self.run_actions(ctx.with_root(item))
-              end
+              ctx.set_scoped_info('exhibit/item/info', { })
+              self.run_actions(ctx.with_root(item))
+              info = ctx.get_scoped_info('exhibit/item/info')
+
               info['id'] = (@id.run(ctx.with_root(item)).first.to_s rescue nil)
               if self.mode == 'add'
                 if info['id'].nil?
@@ -32,9 +33,9 @@ module Fabulator
                 end
                 info['type'] = self.type(ctx.with_root(item)).first.to_s
                 info['label'] = self.label(ctx.with_root(item)).first.to_s
-                Fabulator::Exhibit::Actions::Lib.add_info(db, :items, info)
+                Fabulator::Exhibit::Lib.add_info(db, :items, info)
               elsif self.mode == 'remove' && !info['id'].nil?
-                Fabulator::Exhibit::Actions::Lib.remove_info(db, :items, info['id'])
+                Fabulator::Exhibit::Lib.remove_info(db, :items, info['id'])
               end
             end
           end
@@ -57,7 +58,7 @@ module Fabulator
             scopeType = (self.scope_type(ctx).first.to_s rescue nil)
             db = nil
             if m == 'merge' || !scopeType.nil?
-            db = Fabulator::Exhibit::Actions::Lib.fetch_database(nom)
+            db = Fabulator::Exhibit::Lib.fetch_database(nom)
               if !db.nil? && m == 'overwrite'  # !scope_type.nil? is a consequence
                 # remove any items of scope_type
                 db[:items].delete_if{ |k,v| v['type'] == scopeType }
@@ -66,14 +67,14 @@ module Fabulator
             if db.nil?
               db = { :items => {}, :types => {}, :properties => {} }
             end
-            Fabulator::Exhibit::Actions::Lib.set_database(nom, db)
+            Fabulator::Exhibit::Lib.set_database(nom, db)
  
             begin
               ret = self.run_actions(ctx)
             ensure
-              Fabulator::Exhibit::Actions::Lib.store_database(
+              Fabulator::Exhibit::Lib.store_database(
                 nom,
-                Fabulator::Exhibit::Actions::Lib.get_database(nom)
+                Fabulator::Exhibit::Lib.get_database(nom)
               )
             end
           end

data/lib/fabulator/exhibit/actions/property.rb

@@ -9,7 +9,7 @@ module Fabulator
         
         def run(context, autovivify = false)
           @context.with(context) do |ctx|
-            Fabulator::Exhibit::Actions::Lib.add_info(
+            Fabulator::Exhibit::Lib.add_info(
               self.database(ctx).first.to_s, 
               :properties, {
                 'id' => self.name(ctx).first.to_s,

data/lib/fabulator/exhibit/actions/type.rb

@@ -15,7 +15,7 @@ module Fabulator
             if !pl.nil?
               info['pluralLabel'] = pl
             end
-            Fabulator::Exhibit::Actions::Lib.add_info(
+            Fabulator::Exhibit::Lib.add_info(
               self.database(ctx).first.to_s, :types, info
             )
           end

data/lib/fabulator/exhibit/actions/value.rb

@@ -10,10 +10,8 @@ module Fabulator
 
         def run(context, autovivify = false)
           @context.with(context) do |ctx|
-            Fabulator::Exhibit::Actions::Lib.add_item_to_accumulator(
-              self.name(ctx).first.to_s,
-              self.select(ctx).collect{ |s| s.value }
-            )
+             value = self.select(ctx).collect{ |s| s.value }
+             ctx.get_scoped_info('exhibit/item/info')[self.name(ctx).first.to_s] = value.empty? ? nil : (value.size == 1 ? value.first : value)
           end
         end
       end

data/lib/fabulator/exhibit/lib.rb

@@ -0,0 +1,114 @@
+module Fabulator
+  EXHIBIT_NS = "http://dh.tamu.edu/ns/fabulator/exhibit/1.0#"
+
+  require 'fabulator/exhibit/actions/item'
+  require 'fabulator/exhibit/actions/property'
+  require 'fabulator/exhibit/actions/type'
+  require 'fabulator/exhibit/actions/value'
+
+  module Exhibit
+    class Lib < Fabulator::TagLib
+
+      @@databases = { }
+
+      namespace EXHIBIT_NS
+
+      action 'database', Actions::Database
+      action 'item', Actions::Item
+      action 'value', Actions::Value
+      action 'property', Actions::Property
+      action 'type', Actions::Type
+
+      presentations do
+        transformations_into.html do
+          xslt_from_file File.join(File.dirname(__FILE__), "..", "..", "..", "xslt", "exhibit-html.xsl")
+        end
+      end
+        
+
+      ## should set up an empty database with :items, :types, and :properties
+      def self.fetch_database(nom)
+        raise "fetch_database is not implemented by the framework."
+      end
+
+      def self.store_database(nom, data)
+        raise "store_database is not imeplemented by the framework."
+      end
+
+      def self.get_database(nom)
+        @@databases[nom] ||= self.fetch_database(nom)
+      end
+
+      def self.set_database(nom, data)
+        @@databases[nom] = data
+      end
+
+      def self.store_databases
+        @@databases.keys.each do |k|
+          self.store_database(k, @@databases[k])
+        end
+      end
+
+      def self.add_info(nom, t, item)
+        @@databases ||= {}
+        @@databases[nom] ||= self.fetch_database(nom)
+        @@databases[nom][t][item['id']] ||= { }
+        @@databases[nom][t][item['id']].merge!(item)
+        @@databases[nom][t][item['id']].each_pair do |k,v|
+          if v.nil? || (v.is_a?(Array) && v.empty?) ||
+             v.is_a?(String) && v == ""
+            @@databases[nom][t][item['id']].delete(k)
+          end
+        end
+        case t
+          when :types, :properties
+            @@databases[nom][t][item['id']].delete(:id)
+        end
+      end
+
+      def self.remove_info(nom, t, id)
+        @@databases[nom] ||= self.fetch_database(nom)
+        return if @@databases[nom][t].empty?
+        @@databases[nom][t].delete(id)
+      end
+
+      function 'item' do |ctx, args|
+        # need to get at the 'global' ex:database attribute
+        nom = ctx.attribute(EXHIBIT_NS, 'database', { :inherited => true, :static => true })
+        db = Fabulator::Exhibit::Lib.get_database(nom)
+        args.collect{ |a|
+          id = a.to_s
+          i = db[:items][id]
+          r = ctx.root.anon_node(nil)
+          r.name = id
+          i.each_pair do |k,v|
+            next if k == "id"
+            v = [ v ] unless v.is_a?(Array)
+            v.each do |vv|
+              r.create_child(k,vv)
+            end
+          end
+          r
+        }
+      end
+
+      ## need to make this an iterator
+      function 'items' do |ctx, args|
+        nom = ctx.attribute(EXHIBIT_NS, 'database', { :inherited => true, :static => true })
+        db = Fabulator::Exhibit::Lib.get_database(nom)
+        ret = ctx.root.anon_node(nil)
+        db[:items].each_pair{ |id, item|
+          i = ret.create_child(id, nil)
+          item.each_pair do |k,v|
+            next if k == "id"
+            v = [ v ] unless v.is_a?(Array)
+            v.each do |vv|
+              i.create_child(k,vv)
+            end
+          end
+        }
+        [ ret ]
+      end
+    end
+  end
+end

data/lib/fabulator/exhibit.rb

@@ -1,2 +1,2 @@
-require 'fabulator/exhibit/actions'
+require 'fabulator/exhibit/lib'
 require 'fabulator/exhibit/version'

data/xslt/exhibit-html.xsl

@@ -0,0 +1,221 @@
+<?xml version="1.0" ?>
+<xsl:stylesheet
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:ex="http://dh.tamu.edu/ns/fabulator/exhibit/1.0#"
+  version="1.0"
+>
+  <xsl:output
+    method="html"
+    indent="yes"
+  />
+
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="ex:exhibit">
+    <div>
+      <xsl:attribute name="class">fabulator-exhibit</xsl:attribute>
+      <xsl:attribute name="source"><xsl:value-of select="@ex:database" /></xsl:attribute>
+      <xsl:attribute name="id"><xsl:value-of select="generate-id(.)" /></xsl:attribute>
+      <xsl:attribute name="ex:exhibitLabel"><xsl:value-of select="ex:caption"/></xsl:attribute>
+      <xsl:if test="ex:counters"><xsl:attribute name="ex:counters"><xsl:value-of select="ex:counters/ex:single" />:<xsl:value-of select="ex:counters/ex:plural" /></xsl:attribute></xsl:if>
+      <xsl:apply-templates select="ex:collection" />
+      <div class="facets">
+      <xsl:apply-templates select="*[substring(local-name(.), string-length(local-name(.))-5) = '-facet']" />
+      </div>
+      <div class="views">
+      <xsl:attribute name="id"><xsl:value-of select="generate-id(.)" />-views</xsl:attribute>
+        <xsl:if test="count(*[substring(local-name(.), string-length(local-name(.))-4) = '-view']) > 1">
+          <xsl:attribute name="ex:role">viewPanel</xsl:attribute>
+        </xsl:if>
+        <xsl:apply-templates select="*[substring(local-name(.), string-length(local-name(.))-4) = '-view']" />
+      </div>
+      <xsl:apply-templates select="ex:lens" />
+    </div>
+  </xsl:template>
+
+  <xsl:template match="ex:collection">
+    <div>
+      <xsl:attribute name="ex:role">exhibit-collection</xsl:attribute>
+      <xsl:attribute name="ex:itemTypes"><xsl:value-of select="@ex:types" /></xsl:attribute>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="ex:tile-view">
+    <div>
+      <xsl:attribute name="ex:role">view</xsl:attribute>
+      <xsl:attribute name="class">view tile-view</xsl:attribute>
+      <xsl:attribute name="ex:viewClass">Tile</xsl:attribute>
+      <xsl:attribute name="id"><xsl:value-of select="generate-id(.)" /></xsl:attribute>
+      <xsl:attribute name="ex:viewLabel"><xsl:value-of select="ex:caption"/></xsl:attribute>
+      <xsl:call-template name="apply-lenses" />
+    </div>
+  </xsl:template>
+
+  <xsl:template name="apply-lenses">
+    <xsl:choose>
+      <xsl:when test="ex:lens">
+        <xsl:apply-templates select="ex:lens" />
+      </xsl:when>
+      <xsl:otherwise>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  
+
+  <xsl:template match="ex:thumbnail-view">
+    <div>
+      <xsl:attribute name="ex:role">view</xsl:attribute>
+      <xsl:attribute name="ex:viewClass">Thumbnail</xsl:attribute>
+      <xsl:attribute name="ex:viewLabel"><xsl:value-of select="ex:caption"/></xsl:attribute>
+      <xsl:attribute name="id"><xsl:value-of select="generate-id(.)" /></xsl:attribute>
+      <xsl:call-template name="apply-lenses" />
+    </div>
+  </xsl:template>
+
+  <xsl:template match="ex:map-view">
+    <div>
+      <xsl:attribute name="ex:role">view</xsl:attribute>
+      <xsl:attribute name="ex:viewClass">Map</xsl:attribute>
+      <xsl:attribute name="id"><xsl:value-of select="generate-id(.)" /></xsl:attribute>
+      <xsl:attribute name="ex:latlng"><xsl:value-of select="@ex:select" /></xsl:attribute>
+      <xsl:attribute name="ex:center"><xsl:value-of select="@ex:center" /></xsl:attribute>
+      <xsl:attribute name="ex:zoom"><xsl:value-of select="@ex:zoom-level" /></xsl:attribute>
+      <xsl:attribute name="ex:size"><xsl:value-of select="@ex:controls-size" /></xsl:attribute>
+      <xsl:attribute name="ex:type"><xsl:value-of select="@ex:map-type" /></xsl:attribute>
+      <xsl:attribute name="ex:viewLabel"><xsl:value-of select="ex:caption"/></xsl:attribute>
+      <xsl:call-template name="apply-lenses" />
+    </div>
+  </xsl:template>
+
+  <xsl:template match="ex:timeline-view">
+    <div>
+      <xsl:attribute name="ex:role">view</xsl:attribute>
+      <xsl:attribute name="id"><xsl:value-of select="generate-id(.)" /></xsl:attribute>
+      <xsl:attribute name="ex:viewClass">Timeline</xsl:attribute>
+      <xsl:attribute name="ex:start"><xsl:value-of select="@ex:select-start" /></xsl:attribute>
+      <xsl:attribute name="ex:end"><xsl:value-of select="@ex:select-end" /></xsl:attribute>
+      <xsl:attribute name="ex:viewLabel"><xsl:value-of select="ex:caption"/></xsl:attribute>
+      <xsl:call-template name="apply-lenses" />
+    </div>
+  </xsl:template>
+
+  <xsl:template match="ex:tabular-view">
+    <div>
+      <xsl:attribute name="ex:role">view</xsl:attribute>
+      <xsl:attribute name="id"><xsl:value-of select="generate-id(.)" /></xsl:attribute>
+      <xsl:attribute name="ex:viewClass">Tabular</xsl:attribute>
+      <xsl:attribute name="ex:viewLabel"><xsl:value-of select="ex:caption"/></xsl:attribute>
+      <xsl:attribute name="ex:columns"><xsl:for-each select="ex:column/@ex:select"><xsl:value-of select="."/><xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if></xsl:for-each></xsl:attribute>
+      <xsl:attribute name="ex:columnLabels"><xsl:for-each select="ex:column/ex:caption"><xsl:value-of select="."/><xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if></xsl:for-each></xsl:attribute>
+      <xsl:call-template name="apply-lenses" />
+    </div>
+  </xsl:template>
+
+  <xsl:template match="ex:lens">
+    <div>
+      <xsl:attribute name="ex:role">lens</xsl:attribute>
+      <xsl:attribute name="id"><xsl:value-of select="generate-id(.)" /></xsl:attribute>
+      <xsl:attribute name="ex:itemTypes"><xsl:value-of select="@ex:types" /></xsl:attribute>
+      <xsl:attribute name="style">display: none;</xsl:attribute>
+      <xsl:apply-templates select="ex:title" />
+      <xsl:apply-templates select="ex:body" />
+      <xsl:if test="not(ex:title | ex:body)">
+      </xsl:if>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="ex:list-facet">
+    <div>
+      <xsl:attribute name="ex:role">facet</xsl:attribute>
+      <xsl:attribute name="id"><xsl:value-of select="generate-id(.)" /></xsl:attribute>
+      <xsl:attribute name="ex:expression"><xsl:value-of select="@ex:select" /></xsl:attribute>
+      <xsl:attribute name="ex:facetClass">List</xsl:attribute>
+      <xsl:attribute name="ex:facetLabel"><xsl:value-of select="ex:caption" /></xsl:attribute>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="ex:search-facet">
+    <div>
+      <xsl:attribute name="ex:role">facet</xsl:attribute>
+      <xsl:attribute name="id"><xsl:value-of select="generate-id(.)" /></xsl:attribute>
+      <xsl:attribute name="ex:facetClass">TextSearch</xsl:attribute>
+      <xsl:attribute name="ex:expression"><xsl:value-of select="@ex:select" /></xsl:attribute>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="ex:title">
+    <div class="exhibit-lens-title">
+      <xsl:apply-templates />
+    </div>
+  </xsl:template>
+
+  <xsl:template match="ex:value">
+    <span>
+      <xsl:attribute name="ex:content"><xsl:value-of select="@ex:select" /></xsl:attribute>
+    </span>
+  </xsl:template>
+
+  <xsl:template match="ex:body">
+    <div class="exhibit-lens-body">
+      <xsl:apply-templates />
+    </div>
+  </xsl:template>
+
+  <xsl:template match="ex:property-list">
+    <table class="exhibit-lens-properties">
+      <tbody>
+        <xsl:apply-templates select="ex:property" />
+      </tbody>
+    </table>
+  </xsl:template>
+
+  <xsl:template match="ex:property-list/ex:property">
+    <tr class="exhibit-lens-property">
+      <td class="exhibit-lens-property-name"><xsl:value-of select="ex:caption" /><xsl:text>: </xsl:text></td>
+      <td class="exhibit-lens-property-values"><span>
+        <xsl:attribute xsl:name="ex:content"><xsl:value-of select="@ex:select" /></xsl:attribute>
+      </span></td>
+    </tr>
+  </xsl:template>
+
+  <xsl:template match="ex:property">
+    <xsl:if test="ex:caption">
+      <span class="exhibit-lens-property-name"><xsl:value-of select="ex:caption" /></span>
+    </xsl:if>
+    <span class="exhibit-lens-property-values">
+      <span>
+        <xsl:attribute xsl:name="ex:content"><xsl:value-of select="@ex:select" /></xsl:attribute>
+      </span>
+    </span>
+  </xsl:template>
+
+  <xsl:template match="ex:caption">
+    <xsl:apply-templates />
+  </xsl:template>
+
+  <xsl:template match="ex:section">
+    <div>
+      <xsl:attribute name="ex:section"><xsl:value-of select="@ex:select" /></xsl:attribute>
+      <xsl:apply-templates />
+    </div>
+  </xsl:template>
+
+  <xsl:template match="ex:otherwise">
+    <div>
+      <xsl:attribute name="class">exhibit-otherwise</xsl:attribute>
+      <xsl:apply-templates />
+    </div>
+  </xsl:template>
+
+  <xsl:template match="ex:repeated">
+    <div>
+      <xsl:attribute name="ex:repeated"><xsl:value-of select="@ex:select" /></xsl:attribute>
+      <xsl:apply-templates />
+    </div>
+  </xsl:template>
+  
+</xsl:stylesheet>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabulator-exhibit
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 +00:00
+date: 2010-10-26 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 13
         segments: 
         - 0
         - 0
-        - 7
-        version: 0.0.7
+        - 9
+        version: 0.0.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -66,16 +66,19 @@ files:
 - features/simple-database.feature
 - features/step_definitions/exhibit_steps.rb
 - features/step_definitions/expression_steps.rb
+- features/step_definitions/template_steps.rb
 - features/step_definitions/xml_steps.rb
 - features/support/env.rb
+- features/templates.feature
 - lib/fabulator-exhibit.rb
 - lib/fabulator/exhibit.rb
-- lib/fabulator/exhibit/actions.rb
 - lib/fabulator/exhibit/actions/item.rb
 - lib/fabulator/exhibit/actions/property.rb
 - lib/fabulator/exhibit/actions/type.rb
 - lib/fabulator/exhibit/actions/value.rb
+- lib/fabulator/exhibit/lib.rb
 - lib/fabulator/exhibit/version.rb
+- xslt/exhibit-html.xsl
 - test/test_helper.rb
 - test/test_fabulator-xml.rb
 has_rdoc: true

data/lib/fabulator/exhibit/actions.rb

@@ -1,124 +0,0 @@
-module Fabulator
-  EXHIBIT_NS = "http://dh.tamu.edu/ns/fabulator/exhibit/1.0#"
-
-  require 'fabulator/exhibit/actions/item'
-  require 'fabulator/exhibit/actions/property'
-  require 'fabulator/exhibit/actions/type'
-  require 'fabulator/exhibit/actions/value'
-
-  module Exhibit
-    module Actions
-      class Lib < Fabulator::TagLib
-
-        @@databases = { }
-
-        namespace EXHIBIT_NS
-
-        action 'database', Database
-        action 'item', Item
-        action 'value', Value
-        action 'property', Property
-        action 'type', Type
-
-        ## should set up an empty database with :items, :types, and :properties
-        def self.fetch_database(nom)
-          raise "fetch_database is not implemented by the framework."
-        end
-
-        def self.store_database(nom, data)
-          raise "store_database is not imeplemented by the framework."
-        end
-
-        def self.get_database(nom)
-          @@databases[nom] ||= self.fetch_database(nom)
-        end
-
-        def self.set_database(nom, data)
-          @@databases[nom] = data
-        end
-
-        def self.store_databases
-          @@databases.keys.each do |k|
-            self.store_database(k, @@databases[k])
-          end
-        end
-
-        def self.accumulate_item_info(&block)
-          @@item ||=[]
-          @@item.unshift({})
-          yield
-          @@item.shift
-        end
-
-        def self.add_item_to_accumulator(k,v)
-          return if @@item.empty?
-          if v.is_a?(Array) && v.size == 1
-            v = v[0]
-          end
-          @@item[0][k] = v
-        end
-
-        def self.add_info(nom, t, item)
-          @@databases ||= {}
-          @@databases[nom] ||= self.fetch_database(nom)
-          @@databases[nom][t][item['id']] ||= { }
-          @@databases[nom][t][item['id']].merge!(item)
-          @@databases[nom][t][item['id']].each_pair do |k,v|
-            if v.nil? || (v.is_a?(Array) && v.empty?) ||
-               v.is_a?(String) && v == ""
-              @@databases[nom][t][item['id']].delete(k)
-            end
-          end
-          case t
-            when :types, :properties
-              @@databases[nom][t][item['id']].delete(:id)
-          end
-        end
-
-        def self.remove_info(nom, t, id)
-          @@databases[nom] ||= self.fetch_database(nom)
-          return if @@databases[nom][t].empty?
-          @@databases[nom][t].delete(id)
-        end
-
-        function 'item' do |ctx, args|
-          # need to get at the 'global' ex:database attribute
-          nom = ctx.attribute(EXHIBIT_NS, 'database', { :inherited => true, :static => true })
-          db = Fabulator::Exhibit::Actions::Lib.get_database(nom)
-          args.collect{ |a|
-            id = a.to_s
-            i = db[:items][id]
-            r = ctx.root.anon_node(nil)
-            r.name = id
-            i.each_pair do |k,v|
-              next if k == "id"
-              v = [ v ] unless v.is_a?(Array)
-              v.each do |vv|
-                r.create_child(k,vv)
-              end
-            end
-            r
-          }
-        end
-
-        ## need to make this an iterator
-        function 'items' do |ctx, args|
-          nom = ctx.attribute(EXHIBIT_NS, 'database', { :inherited => true, :static => true })
-          db = Fabulator::Exhibit::Actions::Lib.get_database(nom)
-          ret = ctx.root.anon_node(nil)
-          db[:items].each_pair{ |id, item|
-            i = ret.create_child(id, nil)
-            item.each_pair do |k,v|
-              next if k == "id"
-              v = [ v ] unless v.is_a?(Array)
-              v.each do |vv|
-                i.create_child(k,vv)
-              end
-            end
-          }
-          [ ret ]
-        end
-      end
-    end
-  end
-end