radiant-fabulator_exhibit-extension 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.3 2010-10-28
+* 2 major enhancement
+  * Supports conditional parts in lenses (if-exists)
+  * Shows options in list facet that have no current matches (configurable)
+
 === 0.0.2 2010-10-26
 * 1 major enhancement:
   * Provides javascript/css for implementing Exhibit views in HTML

data/README.markdown

@@ -14,6 +14,16 @@ libraries:
 
 * ruby-fabulator-exhibit gem
 
+After installation, you will need to add the following to your site's 
+environment.rb:
+
+  config.gem 'radiant-fabulator_exhibit-extension'
+
+and the following to your site's Rakefile:
+
+  require 'tasks/fabulator_exhibit_extension'
+
+
 == LICENSE:
 
 N.B.: The JavaScript libraries in this distribution are under a separate

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gem.email = "jgsmith@tamu.edu"
     gem.homepage = "http://github.com/jgsmith/radiant-fabulator-exhibit"
     gem.authors = ["James Smith"]
-    gem.add_dependency('radiant-fabulator-extension', '>= 0.0.6')
+    gem.add_dependency('radiant-fabulator-extension', '>= 0.0.7')
     gem.add_dependency('fabulator-exhibit', '>= 0.0.4')
     gem.add_dependency('json', '>= 1.4.3')
     gem.add_dependency('uuid', '>= 2.3.1')
@@ -122,7 +122,7 @@ end
 desc 'Generate documentation for the fabulator_rdf extension.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'FabulatorRdfExtension'
+  rdoc.title    = 'FabulatorExhibitExtension'
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/fabulator_exhibit_extension.rb

@@ -2,7 +2,7 @@ require 'fabulator/exhibit'
 require 'json'
 
 class FabulatorExhibitExtension < Radiant::Extension
-  version "0.0.2"
+  version "0.0.3"
   description "Exhibit extension to the Fabulator extension"
   url "http://github.com/jgsmith/radiant-fabulator-exhibit"
 

data/lib/tasks/fabulator_exhibit_extension.rb

@@ -0,0 +1,30 @@
+namespace :radiant do
+  namespace :extensions do
+    namespace :fabulator_exhibit do
+
+      desc "Runs the migration for the Fabulator Exhibit extension"
+      task :migrate => :environment do 
+        require 'radiant/extension_migrator'
+        if ENV["VERSION"]
+          FabulatorExhibitExtension.migrator.migrate(ENV["VERSION"].to_i)
+          Rake::Task['db:schema:dump'].invoke
+        else
+          FabulatorExhibitExtension.migrator.migrate
+          Rake::Task['db:schema:dump'].invoke
+        end
+      end
+
+      desc "Copies public assets of the Fabulator Exhibit extenion to the instance public/ directory."
+      task :update => :environment do
+        is_svn_or_dir = proc { |path| path =~ /\.svn/ || File.directory?(path) }
+        Dir[FabulatorExhibitExtension.root + "/public/**/*"].reject(&is_svn_or_dir).each do |file|
+          path = file.sub(FabulatorExhibitExtension.root, '')
+          directory = File.dirname(path)
+          puts "Copying #{path}..."
+          mkdir_p RAILS_ROOT + directory, :verbose => false
+          cp file, RAILS_ROOT + path, :verbose => false
+        end
+      end
+    end
+  end
+end

data/public/javascripts/fabulator/exhibit/data.js

@@ -119,6 +119,20 @@ Fabulator.namespace('Exhibit');
       }
       else {
         elmt = null;
+
+        if( templateNode.condition != null ) {
+          if( templateNode.condition.test == "if-exists" ) {
+            if( !templateNode.condition.expression.testExists(
+                   { "value": rootID },
+                   { "value": "item" },
+                   "value",
+                   that.dataSource
+                )) {
+              return;
+            }
+          }
+        }
+
         if( "tag" in templateNode ) {
           tag = templateNode.tag;
           if( parentElmt != null ) {
@@ -151,8 +165,10 @@ Fabulator.namespace('Exhibit');
           if( attribute == "field" ) {
             result[value] = elmt;
           }
-          else if( attribute == "className" ) {
-            elmt.className = value;
+          else if( attribute == "class" ) {
+            $(value.split(/\s+/)).each(function(idx, n) {
+              $(elmt).addClass(n);
+            });
           }
           else if( attribute == "id" ) {
             elmt.id = id;
@@ -163,12 +179,24 @@ Fabulator.namespace('Exhibit');
           else if( attribute == "type" && elm.tagName == "input") {
             // do nothing
           }
-          else if( attribute == "style" ) {
+          else if( attribute == "styles" ) {
             for( n in value ) {
               v = value[n];
               elmt.style[n] = v;
             }
           }
+          else if( attribute == "attributes" ) {
+            $(value).each(function(idx, a) {
+              if( a.name == "class" ) {
+                $(a.value.split(/\s+/)).each(function(idx, v) {
+                  $(elmt).addClass(v);
+                });
+              }
+              else {
+                $(elmt).attr(a.name, a.value);
+              }
+            });
+          }
           else if( attribute == "content" ) {
             if( value != null ) {
               items = value.evaluateOneItem(rootID, that.dataSource);
@@ -206,8 +234,8 @@ Fabulator.namespace('Exhibit');
               }
             }
           }
-          else if( attribute != "tag" && attribute != "elmt" ) {
-            elmt.setAttribute(attribute, value);
+          else if( attribute != "tag" && attribute != "elmt" && attribute != "condition" && typeof(value) == "string" ) {
+            $(elmt).attr(attribute, value);
           }
         }
         return elmt;
@@ -462,7 +490,7 @@ Fabulator.namespace('Exhibit');
         that.events.onAfterLoadingTypes.fire(that);
       }
       catch(e) {
-        console.log("loadTypes failed:", e);
+        Exhibit.debug("loadTypes failed:", e);
       }
     };
 
@@ -504,7 +532,7 @@ Fabulator.namespace('Exhibit');
         that.events.onAfterLoadingProperties.fire(that);
       }
       catch(e) {
-        console.log("loadProperties failed: ", e);
+        Exhibit.debug("loadProperties failed: ", e);
       }
     };
 
@@ -553,7 +581,7 @@ Fabulator.namespace('Exhibit');
         that.events.onAfterLoadingItems.fire(that);
       }
       catch(e) {
-        console.log("loadItems failed: ", e);
+        Exhibit.debug("loadItems failed: ", e);
       }
     };
 
@@ -561,14 +589,14 @@ Fabulator.namespace('Exhibit');
       var id, label, uri, type, isArray, p, i, n;
 
       if(!("label" in item) && !("id" in item)) {
-        console.log("Item entry has no label and no id: ", item);
+        Exhibit.debug("Item entry has no label and no id: ", item);
         return;
       }
 
       if(!("label" in item)) {
         id = item.id;
         if( !that.items.contains(id) ) {
-          console.log("Cannot add new item containing no label: ", item);
+          Exhibit.debug("Cannot add new item containing no label: ", item);
         }
       }
       else {

data/public/javascripts/fabulator/exhibit/facets.js

@@ -302,7 +302,7 @@ Fabulator.namespace('Exhibit');
           }
         }
         catch(e) {
-          console.log(e);
+          Exhibit.debug(e);
         }
       }
 
@@ -402,7 +402,7 @@ Fabulator.namespace('Exhibit');
         facetValueResult = path.walkForward(items, "item", dataView.dataSource);
         valueType = facetValueResult.valueType;
 
-        if( facetValueResult.size > 0 ) {
+        if( facetValueResult.size() > 0 ) {
           facetValueResult.forEachValue(function(facetValue) {
             var itemSubcollection;
             if( filter.contains(facetValue) ) {
@@ -424,13 +424,20 @@ Fabulator.namespace('Exhibit');
         entries = [ ];
 
         path = options.facet.expression;
-        facetValueResult = path.walkForward(items, "item", dataView.dataSource);
+        facetValueResult = path.walkForward(dataView.dataSource.items(), "item", dataView.dataSource);
         valueType = facetValueResult.valueType || "text";
 
+
         if( facetValueResult.size() > 0 ) {
           facetValueResult.forEachValue(function(facetValue) {
-            var itemSubcollection = path.evaluateBackward(facetValue, valueType, items, dataView.dataSource);
-            entries.push({ value: facetValue, count: itemSubcollection.size(), selectionLabel: facetValue, selected: valueSet.contains(facetValue) });
+            var itemSubcollection = path.evaluateBackward(facetValue, valueType, items, dataView.dataSource),
+                count = 0;
+
+            $(items).each(function(idx, id) {
+              count += (itemSubcollection.contains(id) ? 1 : 0);
+            });
+ 
+            entries.push({ value: facetValue, count: count, selectionLabel: facetValue, selected: valueSet.contains(facetValue) });
           });
         }
 

data/public/javascripts/fabulator/exhibit/views.js

@@ -250,6 +250,9 @@
     return fragments;
   };
 
+  var processStyle = function(that, value) {
+  };
+
   var processors = { };
 
   processors.TemplateNode = function(node) {
@@ -352,7 +355,25 @@
         else {
         }
       }
-      else if( name == "style") {
+      else {
+        if( name == "style") {
+          processStyle(that, value);
+        } else if( name != "id" ) {
+          if( name == "cellspacing" ) {
+            name = "cellSpacing";
+          }
+          else if( name == "cellpadding" ) {
+            name = "cellPadding";
+          }
+          else if( name == "bgcolor" ) {
+            name = "bgColor";
+          }
+
+          that.attributes.push({
+            name: name,
+            value: value
+          });
+        }
       }
     }
 

data/public/stylesheets/fabulator/exhibit/exhibit.css

@@ -89,7 +89,8 @@
   padding-right: 2px;
   border: 1px solid #cccccc;
   background-color: #eeeeee;
-  padding-left: 14px;
+  padding-left: 10px;
+  margin-bottom: 1px;
 }
 
 .exhibit-facet-not-selected {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-fabulator_exhibit-extension
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 +00:00
+date: 2010-10-29 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 0
-        - 6
-        version: 0.0.6
+        - 7
+        version: 0.0.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -107,6 +107,7 @@ files:
 - db/migrate/001_create_fabulator_exhibit_tables.rb
 - fabulator_exhibit_extension.rb
 - lib/radiant-fabulator_exhibit-extension.rb
+- lib/tasks/fabulator_exhibit_extension.rb
 - lib/tasks/fabulator_exhibit_extension_tasks.rake
 - public/javascripts/fabulator/exhibit/data.js
 - public/javascripts/fabulator/exhibit/exhibit.js