radiant-fabulator_exhibit-extension 0.0.4 → 0.0.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.5 2010-11-06
+* 1 major enhancement
+  * Progress bar while loading items
+
 === 0.0.4 2010-11-06
 * 1 major enhancement
   * Exhbit databases are now more than just blobs of text.  Run the migration

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/app/controllers/api/exhibits_controller.rb

@@ -6,7 +6,7 @@ class Api::ExhibitsController < ApplicationController
   def show
     @exhibit = FabulatorExhibit.find(:first, :conditions => [ "name = ?", params[:id] ])
     respond_to do |format|
-      format.json { render :json => @exhibit.data }
+      format.json { render :json => @exhibit.database.to_json }
     end
   end
 end

data/app/models/fabulator_exhibit.rb

@@ -9,10 +9,6 @@ class FabulatorExhibit < ActiveRecord::Base
   belongs_to :updated_by, :class_name => 'User'
   belongs_to :created_by, :class_name => 'User'
 
-  def data
-    self.database.to_json
-  end
-
   def database
     FabulatorExhibitExtension::Database.new(self)
   end

data/app/models/fabulator_exhibit_property.rb

@@ -2,7 +2,5 @@ class FabulatorExhibitProperty < ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => [ :fabulator_exhibit_id ]
 
-  before_save :freeze_data
-
   belongs_to :fabulator_exhibit
 end

data/app/models/fabulator_exhibit_type.rb

@@ -2,7 +2,5 @@ class FabulatorExhibitType < ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => [ :fabulator_exhibit_id ]
 
-  before_save :freeze_data
-
   belongs_to :fabulator_exhibit
 end

data/db/migrate/002_create_fabulator_exhibit_content_tables.rb

@@ -27,30 +27,36 @@ class CreateFabulatorExhibitContentTables < ActiveRecord::Migration
     FabulatorExhibit.find(:all).each do |db|
       data = (JSON.parse(db.data) rescue { 'items' => [], 'types' => {}, 'properties' => {} })
       data['types'].each_pair do |k,t|
-        t_ob = FabulatorExhibitType.create({
-          :fabulator_exhibit_id => db.id,
-          :name => k,
-          :data => t.to_json
-        })
-        t_ob.save!
+        if !k.nil? && k != ""
+          t_ob = FabulatorExhibitType.create({
+            :fabulator_exhibit_id => db.id,
+            :name => k,
+            :data => t.to_json
+          })
+          t_ob.save!
+        end
       end
 
       data['properties'].each_pair do |k,p|
-        p_ob = FabulatorExhibitProperty.create({
-          :fabulator_exhibit_id => db.id,
-          :name => k,
-          :data => p.to_json
-        })
-        p_ob.save!
+        if !k.nil? && k != ""
+          p_ob = FabulatorExhibitProperty.create({
+            :fabulator_exhibit_id => db.id,
+            :name => k,
+            :data => p.to_json
+          })
+          p_ob.save!
+        end
       end
 
       data['items'].each do |i|
-        i_ob = FabulatorExhibitItem.create({
-          :fabulator_exhibit_id => db.id,
-          :uuid => i['id'],
-          :data => i.to_json
-        });
-        i_ob.save!
+        if !i['id'].nil? && i['id'] != ""
+          i_ob = FabulatorExhibitItem.create({
+            :fabulator_exhibit_id => db.id,
+            :uuid => i['id'],
+            :data => i.to_json
+          });
+          i_ob.save!
+        end
       end
     end
   end

data/fabulator_exhibit_extension.rb

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

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

@@ -615,7 +615,7 @@ Fabulator.namespace('Exhibit');
     };
 
     that.loadItems = function(items, baseURI) {
-      var spo, ops, indexTriple, i, entry, n;
+      var spo, ops, indexTriple, i, entry, n, progress, percent, old_percent;
 
       var indexPut = function(index, x, y, z) {
         var hash = index[x],
@@ -642,6 +642,18 @@ Fabulator.namespace('Exhibit');
 
 
       that.events.onBeforeLoadingItems.fire(that);
+       $("<div id='progress-items-" + options.source + "'>" +
+         "<div class='flc-progress progress-pop-up exhibit-progress-pop-up'><h3>Loading " + items.length + " Item" + (items.length == 1 ? "" : "s") + "</h3>" +
+          "<div class='flc-progress-bar progress-bar'>" +
+            "<div class='flc-progress-indicator progress-indicator'></div>" +
+          "</div>" +
+          "<p class='flc-progress-label progress-label'>0% Complete</p>" +
+         "</div></div>").appendTo($("html > body"));
+
+      progress = fluid.progress("#progress-items-" + options.source);
+      progress.show();
+      old_percent = 0;
+
       try {
         baseURI = canonicalBaseURI(baseURI);
 
@@ -651,6 +663,11 @@ Fabulator.namespace('Exhibit');
         };
 
         for(i = 0, n = items.length; i < n; i++) {
+          percent = (i * 100 / n);
+          if( percent > old_percent ) {
+            old_percent = percent;
+            progress.update(percent, percent + "% Complete");
+          }
           entry = items[i];
           if( typeof(entry) == "object" ) {
             that.loadItem(entry, indexTriple, baseURI);
@@ -661,6 +678,8 @@ Fabulator.namespace('Exhibit');
       catch(e) {
         Exhibit.debug("loadItems failed: ", e);
       }
+      progress.update(100, "100% Complete");
+      progress.hide();
     };
 
     that.loadItem = function(item, indexFn, baseURI) {

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

@@ -108,3 +108,9 @@
   display: block;
   text-align: center;
 }
+
+.exhibit-progress-pop-up {
+  position: absolute;
+  right: 40%;
+  top: 40%;
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-fabulator_exhibit-extension
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - James Smith