radiant-fabulator_exhibit-extension 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,12 @@
+=== 0.0.4 2010-11-06
+* 1 major enhancement
+  * Exhbit databases are now more than just blobs of text.  Run the migration
+    to use the new schema
+* 1 minor enhancement
+  * Items with multiple values are now shown with ex:separator,
+    ex:last-separator, and ex:pair-separator available for inserting
+    HTML between values
+
 === 0.0.3 2010-10-28
 * 2 major enhancement
   * Supports conditional parts in lenses (if-exists)

data/Rakefile

@@ -8,7 +8,7 @@ begin
     gem.homepage = "http://github.com/jgsmith/radiant-fabulator-exhibit"
     gem.authors = ["James Smith"]
     gem.add_dependency('radiant-fabulator-extension', '>= 0.0.7')
-    gem.add_dependency('fabulator-exhibit', '>= 0.0.4')
+    gem.add_dependency('fabulator-exhibit', '>= 0.0.6')
     gem.add_dependency('json', '>= 1.4.3')
     gem.add_dependency('uuid', '>= 2.3.1')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

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

data/app/models/fabulator_exhibit.rb

@@ -8,4 +8,12 @@ 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
 end

data/app/models/fabulator_exhibit_item.rb

@@ -0,0 +1,9 @@
+class FabulatorExhibitItem < ActiveRecord::Base
+  validates_presence_of :uuid
+  validates_uniqueness_of :uuid, :scope => [ :fabulator_exhibit_id ]
+
+  belongs_to :fabulator_exhibit
+
+  belongs_to :updated_by, :class_name => 'User'
+  belongs_to :created_by, :class_name => 'User'
+end

data/app/models/fabulator_exhibit_property.rb

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,69 @@
+# this will let us have multiple apps operating on a database at the same time
+class CreateFabulatorExhibitContentTables < ActiveRecord::Migration
+  def self.up
+    create_table :fabulator_exhibit_items do |t|
+      t.references :fabulator_exhibit, :null => false
+      t.string :uuid, :null => false
+      t.text   :data
+      t.references :updated_by
+      t.references :created_by
+      t.timestamps
+    end
+
+    create_table :fabulator_exhibit_types do |t|
+      t.references :fabulator_exhibit, :null => false
+      t.string :name, :null => false
+      t.text :data
+      # we may want some other stuff here, like which xsm we use
+      # to edit something of this type
+    end
+
+    create_table :fabulator_exhibit_properties do |t|
+      t.references :fabulator_exhibit, :null => false
+      t.string :name, :null => false
+      t.text :data
+    end
+
+    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!
+      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!
+      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!
+      end
+    end
+  end
+
+  def self.down
+    FabulatorExhibit.find(:all).each do |db|
+      db.data = db.database.to_json
+      db.save!
+    end
+
+    drop_table :fabulator_exhibit_properties
+    drop_table :fabulator_exhibit_types
+    drop_table :fabulator_exhibit_items
+  end
+end
+

data/fabulator_exhibit_extension.rb

@@ -2,7 +2,7 @@ require 'fabulator/exhibit'
 require 'json'
 
 class FabulatorExhibitExtension < Radiant::Extension
-  version "0.0.3"
+  version "0.0.4"
   description "Exhibit extension to the Fabulator extension"
   url "http://github.com/jgsmith/radiant-fabulator-exhibit"
 
@@ -14,13 +14,16 @@ class FabulatorExhibitExtension < Radiant::Extension
   end
 
   def activate
-    #raise FabulatorExhibitExtension::MissingRequirement.new('FabulatorExtension must be installed and loaded first.') unless defined?(FabulatorExtension)
-
-    %w{exhibit.js data.js  expressions.js views.js facets.js}.each do |s|
+    %w{exhibit.js 
+       util.js 
+       data.js 
+       expressions.js 
+       views.js 
+       facets.js
+       }.each do |s|
       FabulatorExtension.scripts << "fabulator/exhibit/#{s}"
     end
-    #FabulatorExtension.scripts << 'fabulator/exhibit/exhibit.js'
-    #FabulatorExtension.scripts << 'fabulator/exhibit/exhibit-expressions.js'
+
     FabulatorExtension.css << 'fabulator/exhibit/exhibit.css'
 
     tab 'Fabulator' do
@@ -33,34 +36,14 @@ class FabulatorExhibitExtension < Radiant::Extension
     end
     admin.exhibits = load_default_fabulator_exhibit_regions
 
-  ## TODO: better database so we can have multiple applications accessing
-  ##       the same database at the same time
     Fabulator::Exhibit::Lib.class_eval do
       def self.fetch_database(nom)
         db = FabulatorExhibit.find(:first, :conditions => [ 'name = ?', nom ])
-        if db.nil?
-          return { :items => [], :types => {}, :properties => {} }
-        else
-          data = (JSON.parse(db.data) rescue { 'items' => [], 'types' => {}, 'properties' => {} })
-          ret = { :items => { }, :types => data['types'], :properties => data['properties'] }
-          ret[:properties] = { } if ret[:properties].nil?
-          ret[:types] = { } if ret[:types].nil?
-          data['items'].each do |i| 
-            ret[:items][i['id']] = i
-          end
-          return ret
-        end
+        return db.database
       end
 
       def self.store_database(nom, data)
-        db = FabulatorExhibit.find(:first, :conditions => [ 'name = ?', nom ])
-        if db.nil?
-          raise "The Exhibit database #{nom} does not exist."
-        end
-        to_save = { :items => data[:items].values, :properties => data[:properties], :types => data[:types] }
-        db.data = to_save.to_json
-        db.items_count = to_save[:items].size
-        db.save
+        return
       end
     end
   end
@@ -85,3 +68,5 @@ class FabulatorExhibitExtension < Radiant::Extension
     end
   end
 end
+
+require 'fabulator_exhibit_extension/database'

data/lib/fabulator_exhibit_extension/database.rb

@@ -0,0 +1,274 @@
+class FabulatorExhibitExtension
+  class Database
+    def initialize(db)
+      @db = db
+    end
+
+    def to_json
+      '{ "items":' + self[:items].to_json + ', ' +
+      '  "types":' + self[:types].to_json + ', ' +
+      '  "properties":' + self[:properties].to_json +
+      '}'
+    end
+
+    def [](t)
+      case t.to_sym
+        when :items
+          return ItemCollection.new(@db)
+        when :properties
+          return PropertyCollection.new(@db)
+        when :types
+          return TypeCollection.new(@db)
+      end
+    end
+  end
+
+  class ItemCollection
+    def initialize(db)
+      @db = db
+    end
+
+    def [](nom)
+      ob = nil
+      begin
+        ob = @db.fabulator_exhibit_items.find(:first, [ 'uuid = ?', nom ])
+      rescue
+        ob = nil
+      end
+      if ob.nil? 
+        ob = FabulatorExhibitItem.new({
+          :uuid => nom,
+          :fabulator_exhibit_id => @db.id
+        })
+      end
+      Item.new(ob)
+    end
+
+    def include?(nom)
+      ob = nil
+      begin
+        ob = @db.fabulator_exhibit_items.find(:first, [ 'uuid = ?', nom ])
+      rescue
+        ob = nil
+      end
+      return !ob.nil?
+    end
+
+    def []=(nom, hash)
+      ob = self[nom]
+      hash.each_pair do |k,v|
+        ob[k] = v
+      end
+      ob.save
+    end
+
+    def to_json
+      '[' +
+      @db.fabulator_exhibit_items.find(:all).collect{ |i| i.data }.join(", ") +
+      ']'
+    end
+  end
+
+  class PropertyCollection
+    def initialize(db)
+      @db = db
+    end
+
+    def [](nom)
+      ob = nil
+      begin
+        ob = @db.fabulator_exhibit_properties.find(:first, [ 'name = ?', nom ])
+      rescue
+        ob = nil
+      end
+      if ob.nil?
+        ob = FabulatorExhibitProperty.new({
+          :name => nom,
+          :fabulator_exhibit_id => @db.id
+        })
+      end
+      Property.new(ob)
+    end
+
+    def []=(nom, hash)
+      ob = self[nom]
+      hash.each_pair do |k,v|
+        ob[k] = v
+      end
+      ob.save
+    end
+
+    def to_json
+      '{' +
+      @db.fabulator_exhibit_properties.find(:all).collect{ |p|
+        p.name.to_json + ":" + p.data
+      }.join(", ") +
+      '}'
+    end
+  end
+
+  class TypeCollection
+    def initialize(db)
+      @db = db
+    end
+
+    def [](nom)
+      ob = nil
+      begin
+        ob = @db.fabulator_exhibit_types.find(:first, [ 'name = ?', nom ])
+      rescue
+        ob = nil
+      end
+      if ob.nil?
+        ob = FabulatorExhibitType.new({
+          :name => nom,
+          :fabulator_exhibit_id => @db.id
+        })
+      end
+      Type.new(ob)
+    end
+
+    def []=(nom, hash)
+      ob = self[nom]
+      hash.each_pair do |k,v|
+        ob[k] = v
+      end
+      ob.save
+    end
+
+    def to_json
+      '{' +
+      @db.fabulator_exhibit_types.find(:all).collect{ |t|
+        t.name.to_json + ":" + t.data
+      }.join(", ") +
+      '}'
+    end
+  end
+
+  class Item
+    def initialize(i)
+      @item = i
+      @raw_data = ( JSON.parse(i.data) rescue {} )
+    end
+
+    def [](k)
+      @raw_data[k]
+    end
+
+    def []=(k,v)
+      @raw_data[k] = v
+      self.save
+    end
+
+    def delete(k)
+      @raw_data.delete(k)
+      self.save
+    end
+
+    def each_pair(&block)
+      @raw_data.each_pair do |k,v|
+        yield k,v
+      end
+    end
+
+    def merge!(hash)
+      @raw_data.merge!(hash)
+      self.save
+    end
+
+    def save
+      @item.data = @raw_data.to_json
+      @item.save
+    end
+
+    def save!
+      @item.data = @raw_data.to_json
+      @item.save!
+    end
+  end
+
+  class Type
+    def initialize(t)
+      @type = t
+      @raw_data = ( JSON.parse(t.data) rescue {} )
+    end
+
+    def [](k)
+      @raw_data[k]
+    end
+
+    def []=(k,v)
+      @raw_data[k] = v
+      self.save
+    end
+
+    def delete(k)
+      @raw_data.delete(k)
+      self.save
+    end
+
+    def each_pair(&block)
+      @raw_data.each_pair do |k,v|
+        yield k,v
+      end
+    end
+
+    def merge!(hash)
+      @raw_data.merge!(hash)
+      self.save
+    end
+
+    def save
+      @type.data = @raw_data.to_json
+      @type.save
+    end
+
+    def save!
+      @type.data = @raw_data.to_json
+      @type.save!
+    end
+  end
+
+  class Property
+    def initialize(p)
+      @property = p
+      @raw_data = ( JSON.parse(p.data) rescue {} )
+    end
+
+    def [](k)
+      @raw_data[k]
+    end
+
+    def []=(k,v)
+      @raw_data[k] = v
+      self.save
+    end
+
+    def delete(k)
+      @raw_data.delete(k)
+      self.save
+    end
+
+    def each_pair(&block)
+      @raw_data.each_pair do |k,v|
+        yield k,v
+      end
+    end
+
+    def merge!(hash)
+      @raw_data.merge!(hash)
+      self.save
+    end
+
+    def save
+      @property.data = @raw_data.to_json
+      @property.save
+    end
+
+    def save!
+      @property.data = @raw_data.to_json
+      @property.save!
+    end
+  end
+
+end