wontomedia 0.1.1 → 0.2.0

data/db/migrate/20100315135952_provide_scalar_objects.rb

@@ -0,0 +1,32 @@
+# WontoMedia - a wontology web application
+# Copyright (C) 2010 - Glen E. Ivey
+#    www.wontology.com
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License version
+# 3 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program in the file COPYING and/or LICENSE.  If not,
+# see <http://www.gnu.org/licenses/>.
+
+
+class ProvideScalarObjects < ActiveRecord::Migration
+  def self.up
+    add_column :connections, :kind_of_obj, :string    # really an enum
+    add_column :connections, :scalar_obj, :string
+
+    # all existing Connections have Items as their objects
+    execute 'UPDATE connections SET kind_of_obj="item"'
+  end
+
+  def self.down
+    remove_column :connections, :kind_of_object
+    remove_column :connections, :scalar_obj
+  end
+end

data/db/migrate/20100321042343_add_timestamp_columns.rb

@@ -0,0 +1,33 @@
+# WontoMedia - a wontology web application
+# Copyright (C) 2010 - Glen E. Ivey
+#    www.wontology.com
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License version
+# 3 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program in the file COPYING and/or LICENSE.  If not,
+# see <http://www.gnu.org/licenses/>.
+
+
+class AddTimestampColumns < ActiveRecord::Migration
+  def self.up
+    add_column :items, :created_at, :datetime
+    add_column :items, :updated_at, :datetime
+    add_column :connections, :created_at, :datetime
+    add_column :connections, :updated_at, :datetime
+  end
+
+  def self.down
+    remove_column :items, :created_at
+    remove_column :items, :updated_at
+    remove_column :connections, :created_at
+    remove_column :connections, :updated_at
+  end
+end

data/db/schema.rb

@@ -9,22 +9,28 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20090605215028) do
+ActiveRecord::Schema.define(:version => 20100321042343) do
 
   create_table "connections", :force => true do |t|
-    t.integer "subject_id"
-    t.integer "predicate_id"
-    t.integer "obj_id"
-    t.integer "connection_desc_id"
-    t.integer "flags",        :default => 0, :null => false
+    t.integer  "subject_id"
+    t.integer  "predicate_id"
+    t.integer  "obj_id"
+    t.integer  "connection_desc_id"
+    t.integer  "flags",              :default => 0, :null => false
+    t.string   "kind_of_obj"
+    t.string   "scalar_obj"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "items", :force => true do |t|
-    t.string  "name"
-    t.string  "title"
-    t.text    "description"
-    t.string  "sti_type"
-    t.integer "flags",       :default => 0, :null => false
+    t.string   "name"
+    t.string   "title"
+    t.text     "description"
+    t.string   "sti_type"
+    t.integer  "flags",       :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
 end

data/default-custom/app/views/items/home.html.erb

@@ -42,7 +42,7 @@
   <%= render :partial => "content_examples" %>
 <% end -%>
 <% content_for :content_lower_narrow do %>
-  <%= render :partial => "screen_select" %>
+  <%= render :partial => "most_populous_classes" %>
 <% end -%>
 <% content_for :content_bottom do %>
   <div class="horizontal-link-list">

data/default-custom/public/stylesheets/wm.css

@@ -63,6 +63,14 @@ div#fancybox-outer {
 
 
         /* settings for the basic division of pages into areas and boxes */
+.page-title-text {
+  position: absolute;
+  top: 0;
+  left: 15.5%;
+  height: 8ex;
+  width: 69.7%;
+  overflow: hidden;
+}
 .content {
   padding: 2px;
   background-color: white;
@@ -89,12 +97,21 @@ div#fancybox-outer {
 .headline:first-child {
   margin-top: 0;
 }
-.subheading {
+
+h2.subheading {
   font-size: 150%;
+}
+h3.subheading {
+  font-size: 120%;
+  text-decoration: underline;
+}
+.subheading {
   font-weight: bold;
   color: #b0b0ff;
+  margin-top: 0;
   margin-bottom: 1.3ex;
 }
+
 .fine-print {
   font-size: 60%;
   color: #040460;
@@ -212,10 +229,10 @@ p + table {   margin-bottom: 1.5em;  }
 
 #block-help {
   float: right;
-  border-width: 1px;
+  border-width: 2px;
   border-color: #e8e8ff;
   border-style: none solid solid;
-  background: #f8f8ff;
+  background: url("/images/transparent_ltblue_background.png") repeat;
   padding: 0 0.3em;
   height: 2.7ex;
   font-size: 200%;
@@ -229,7 +246,7 @@ p + table {   margin-bottom: 1.5em;  }
   z-index: 150;
   font-size: 110%;
   font-weight: bold;
-  background: url("/images/alert_background.png") repeat;
+  background: url("/images/transparent_white_background.png") repeat;
   text-align: center;
 }
 #alert_box_close_link {

data/lib/helpers/connection_helper.rb

@@ -34,8 +34,91 @@ module ConnectionHelper
     result = ""
     connections.each do |connection|
       result << "<##{connection.subject.name}> <##{connection.predicate.name}> "
-      result << "<##{connection.obj.name}> .\n"
+      if connection.kind_of_obj == Connection::OBJECT_KIND_ITEM
+        result << "<##{connection.obj.name}> .\n"
+      else
+        result << "\"#{connection.scalar_obj}\" .\n"
+      end
     end
     result
   end
+
+  # An operator usable for sorting, returns 0 for a==b, <0 for a<b
+  def self.compare(a, b, factor_hash = {})
+    # sort relationships using built-in predicates to the bottom
+    aflag = a.predicate.flags & Item::DATA_IS_UNALTERABLE
+    bflag = b.predicate.flags & Item::DATA_IS_UNALTERABLE
+    return aflag - bflag if aflag != bflag
+
+      # sort relationships to scalar values above those with item objects
+    # connection with filled-in scalar valued object
+    if a.kind_of_obj && b.kind_of_obj && a.kind_of_obj != b.kind_of_obj
+      return a.kind_of_obj == Connection::OBJECT_KIND_ITEM ? 1 : -1
+    end
+    if a.kind_of_obj.nil? || b.kind_of_obj.nil?
+      # connection with blank object intended to be a scalar
+      a_kind = Connection.first( :conditions => [
+          "subject_id = ? AND predicate_id = ?", a.predicate_id,
+          Item.find_by_name('has_scalar_object') ])
+      b_kind = Connection.first( :conditions => [
+          "subject_id = ? AND predicate_id = ?", b.predicate_id,
+          Item.find_by_name('has_scalar_object') ])
+      if a_kind != b_kind
+        return a_kind.nil? ? 1 : -1
+      end
+    end
+
+    # relationships w/ predicates constrained by max_uses_per_item:
+    #   sort lower maximums closer to top of list.  Sort unconstrained
+    #   predicates as "infinite maximum"
+    max_uses = Item.find_by_name('max_uses_per_item')
+    a_max = Connection.first( :conditions => [
+      "subject_id = ? AND predicate_id = ?", a.predicate_id, max_uses.id ])
+    unless a_max.nil?
+      a_max = a_max.scalar_obj.nil? ? nil : a_max.scalar_obj.to_i
+    end
+    b_max = Connection.first( :conditions => [
+      "subject_id = ? AND predicate_id = ?", b.predicate_id, max_uses.id ])
+    unless b_max.nil?
+      b_max = b_max.scalar_obj.nil? ? nil : b_max.scalar_obj.to_i
+    end
+    unless a_max == b_max
+      return -1 if b_max.nil?
+      return  1 if a_max.nil?
+      return a_max - b_max
+    end
+
+    a_id = a.predicate_id
+    b_id = b.predicate_id
+
+    # sort by "predicate external factor" hash, higher numbers better
+    # (this is intended to support, among other things, sorting based
+    # on the number of times the same predicate is used in the list of
+    # connections being sorted.  Requires caller to make a counting
+    # pass over the sort set first to build the hash
+    a_count = factor_hash[a_id].nil? ? 0 : factor_hash[a_id]
+    b_count = factor_hash[b_id].nil? ? 0 : factor_hash[b_id]
+    return b_count - a_count if a_count != b_count
+
+    # sort by property ID order (this is essentially arbitrary, but
+    # ensures the sort order is stable and that subsequent factors
+    # only affect sorting within groups of connections all referencing
+    # the same property item)
+    return a_id - b_id if a_id != b_id
+
+    # sort connections with missing objects (e.g. "add here"
+    # place-holders) below others
+    a_blank = a.kind_of_obj.nil? ||
+        (a.kind_of_obj == Connection::OBJECT_KIND_ITEM ?
+          a.obj : a.scalar_obj ) == nil
+    b_blank = b.kind_of_obj.nil? ||
+        (b.kind_of_obj == Connection::OBJECT_KIND_ITEM ?
+          b.obj : b.scalar_obj ) == nil
+    return a_blank ? 1 : -1 if a_blank != b_blank
+
+    # sort connections whose objects are built-in below others
+    aflag = a.obj.nil? ? 0 : a.obj.flags & Item::DATA_IS_UNALTERABLE
+    bflag = b.obj.nil? ? 0 : b.obj.flags & Item::DATA_IS_UNALTERABLE
+    return aflag - bflag
+  end
 end

data/lib/helpers/item_helper.rb

@@ -119,10 +119,23 @@ module ItemHelper
 
   # Takes an Item object, +n+, and returns a symbol-indexed hash
   # containing each of the Item's data fields.
-  def self.item_to_hash(n)
+  def self.item_to_hash(item)
 # Really ought to be doing this programatically from the schema....
-    { :id => n.id, :name => n.name, :title => n.title, :flags => n.flags,
-      :description => n.description, :sti_type => n.sti_type }
+    { :id => item.id, :name => item.name, :title => item.title,
+      :flags => item.flags, :description => item.description,
+      :sti_type => item.sti_type, :class_item_id => item.class_item_id }
+  end
+
+  # Map from an Item.name of a built-in item representing an item type
+  # (e.g., is_instance_of ItemType_Item) to the matching internal
+  # Item.sti_type string
+  def self.sti_type_for_ItemType( type_item_name )
+    case type_item_name
+      when 'Value_ItemType_Category'   then 'CategoryItem'
+      when 'Value_ItemType_Individual' then 'IndividualItem'
+      when 'Value_ItemType_Property'   then 'PropertyItem'
+      else ''
+      end
   end
 
 

data/lib/tasks/cucumber.rake

@@ -36,14 +36,12 @@ begin
     Cucumber::Rake::Task.new({:static_ok => 'db:test:prepare'},
         'Run non-Selenium features that should pass') do |t|
       t.binary = vendored_cucumber_binary
-      t.fork = false
       t.profile = "static_acceptance"
     end
 
     Cucumber::Rake::Task.new({:dynamic_ok => 'db:test:prepare'},
         'Run need-Selenium-to-test features that should pass') do |t|
       t.binary = vendored_cucumber_binary
-      t.fork = false
       t.profile = "dynamic_acceptance"
     end
 

data/public/javascripts/forConnectionsForms.js

@@ -16,22 +16,38 @@
 // see <http://www.gnu.org/licenses/>.
 
 
-var selectElems = [ "subject", "predicate", "obj", "submit" ];
-var connectionSubmit;
-var l = window.location;
-var base = l.protocol + "//" + l.hostname + ":" + l.port;
-var lastValue = {}
-
+var selectElems      = [ "subject", "predicate", "obj" ];
 
     // define fields subject to check, order they occur in form
-var requiredConnectionElements = [ "subject", "predicate", "obj", "submit" ];
-var connectionElementNames = [ "Subject selector", "Relationship selector",
-                               "Object selector" ];
+  // these arrays must have same index order:
+var requiredConnectionElements =
+  [ "subject", "predicate", "kind_of_obj", "obj", "submit" ];
+var connectionElementNames =
+  [ "Subject selector", "Relationship selector",
+    "Object kind", "Object content" ];
+var controlIds =
+  [ [ "connection_subject_id" ],
+    [ "connection_predicate_id" ],
+    [ "connection_kind_of_obj_scalar", "connection_kind_of_obj_item" ],
+    [ "connection_scalar_obj", "connection_obj_id" ],
+    [ "connection_submit" ]  // this one doesn't really matter--won't be used
+  ];
+var controlTypes =
+  [ [ "value" ],
+    [ "value" ],
+    [ "checked", "checked" ],
+    [ "value", "value" ],
+    [ "checked" ]            // this one doesn't really matter--won't be used
+  ];
 
     // encoding: -1    -> haven't checked yet
     //           false -> no error
     //           true  -> error condition present
-var connectionFormErrors = {};
+var connectionFormErrors = {};     // don't display errors until user goes past
+
+var lastValue = {}                 // don't error check unless changed
+var connectionSubmit;              // $(submit-botton) for convenience
+
 
 
 if ((typeof inAConnectionsForm !== 'undefined') && inAConnectionsForm){
@@ -40,7 +56,8 @@ if ((typeof inAConnectionsForm !== 'undefined') && inAConnectionsForm){
   lastValue = {
     subject   : $('connection_subject_id').value,
     predicate : $('connection_predicate_id').value,
-    obj       : $('connection_obj_id').value
+    obj       : $('connection_obj_id').value,
+    scalar    : $('connection_scalar_obj').value
   };
 
   for (var c=0; c < requiredConnectionElements.length-1; c++)
@@ -48,24 +65,31 @@ if ((typeof inAConnectionsForm !== 'undefined') && inAConnectionsForm){
       creatingNewConnection ? -1 : false;
 
   for (var c=0; c < selectElems.length; c++){
-    createOnchangeHandler(selectElems[c]);
-    createOnfocusHandler(selectElems[c]);
+    createIdOnchangeHandler(selectElems[c]);
+    createIdOnfocusHandler(selectElems[c]);
   }
+  createKindHandlers();
+  createScalarHandlers();
 
   if (creatingNewConnection)
         // connections/new -- can't submit a blank form
     makeButtonSeemDisabled(connectionSubmit);
   else  // connections/##/edit -- can submit as-is form
     makeButtonSeemEnabled(connectionSubmit);
-
   connectionSubmit.observe('click', submitOnclickHandler);
+  connectionSubmit.observe('focus',
+    function(){ onfocusBehavior(connectionSubmit); } );
+
+  // do after browser has done final layout of all the select controls
+  setDescDivsWidths([ 'subject', 'predicate', 'obj' ]);
+  syncEnabledStateOfObjectControls();
 }
 
 
-function createOnchangeHandler(thisName){
+function createIdOnchangeHandler(thisName){
   var thisElem = $('connection_' + thisName + '_id');
-  if (thisElem == null)
-    thisElem = $('connection_' + thisName);
+  if (thisElem == null)  // only deal with ID select controls
+    return;
   thisElem.observe('change',
     function(){                       // nest all these fn defs for closure
       if (thisElem.value != lastValue[thisName]){
@@ -78,23 +102,12 @@ function createOnchangeHandler(thisName){
         }
         else if (thisElem.value == "-1"){
           divToBlank(thisName);
-          var type = (thisName == "predicate") ? "verb" : "noun";
-          itemCreatePopup(thisElem, type, lastLast);
+          var popupType = (thisName == "predicate") ? "verb" : "noun";
+          itemCreatePopup(thisElem, lastLast, popupType, null);
         }
         else {
           clearError(thisName);
-          divToWorking(thisName);
-          new Ajax.Request(base + "/w/items/" + thisElem.value + ".json", {
-            method: 'get',
-            onSuccess: function(response){
-              var itemObject = response.responseJSON;
-              var key = getFirstHashKey(itemObject);
-              divToText(thisName, itemObject[key]["description"]);
-            },
-            onFailure: function(){
-              divToBlank(thisName);
-            }
-          });
+          loadItemDescDiv(thisName, thisElem);
         }
         refreshSubmitState();
       }
@@ -102,6 +115,44 @@ function createOnchangeHandler(thisName){
   );
 }
 
+function loadItemDescDiv(thisName, thisElem){
+  divToWorking(thisName);
+
+  var winloc = window.location;
+  var base = winloc.protocol + "//" + winloc.hostname + ":" + winloc.port;
+  new Ajax.Request(base + "/w/items/" + thisElem.value + ".json", {
+    method: 'get',
+    onSuccess: function(response){
+      var itemObject = response.responseJSON;
+      var key = getFirstHashKey(itemObject);
+      divToText(thisName, itemObject[key]["description"]);
+    },
+    onFailure: function(){
+      divToBlank(thisName);
+    }
+  });
+}
+
+function createScalarHandlers(){
+  var name = 'scalar';
+  var scalar = $("connection_scalar_obj");
+
+  scalar.observe('change',
+    function(){                       // nest all these fn defs for closure
+      if (scalar.value != lastValue[name]){
+        var lastLast = lastValue[name];
+        lastValue[name] = scalar.value;
+
+        if (scalar.value == "")       // pretend we're same as 'obj_id' select
+          flagConnectionAsRequired('obj');
+        else
+          clearError('obj');
+        refreshSubmitState();
+      }
+    }
+  );
+}
+
 function getFirstHashKey(hashObj){
   for (var key in hashObj)
     return key;
@@ -130,19 +181,57 @@ function divToText(divName, divText){
 }
 
 
-function createOnfocusHandler(thisName){
+function createIdOnfocusHandler(thisName){
   var thisElem = $('connection_' + thisName + '_id');
   if (thisElem == null)
-    thisElem = $('connection_' + thisName);
+    return;
+  thisElem.observe('focus', function(){ onfocusBehavior(thisElem); } );
+}
+
+function createKindHandlers(){
+  thisElem = $('connection_kind_of_obj_scalar');
+  thisElem.observe('focus', function(){ onfocusBehavior(thisElem); } );
+  thisElem.observe('change', kindOnchangeBehavior);
+
+  thisElem = $('connection_kind_of_obj_item');
   thisElem.observe('focus', function(){ onfocusBehavior(thisElem); } );
+  thisElem.observe('change', kindOnchangeBehavior);
+}
+
+function kindOnchangeBehavior(){
+  syncEnabledStateOfObjectControls();
+
+  var itemChecked   = $('connection_kind_of_obj_item'  ).checked;
+  var scalarChecked = $('connection_kind_of_obj_scalar').checked;
+
+  var hasAValue = itemChecked || scalarChecked;
+  if (hasAValue)
+    clearError('kind_of_obj');
+  else
+    flagConnectionAsRequired('kind_of_obj');
+
+  if (connectionFormErrors['obj'] != -1){
+    var value = null;
+    if (itemChecked)
+       value = $('connection_obj_id').value;
+    else
+       value = $('connection_scalar_obj').value;
+    if (value != null && value != "")
+      clearError('obj');               // if selected control has a value, great
+    else
+      flagConnectionAsRequired('obj'); // otherwise, error (ignore other ctrl)
+  }
+
+  refreshSubmitState();
 }
 
 function onfocusBehavior(elem){
-  var eId = elem.id;
+  // find this control's position in flag arrays.  Value of rCE[c] is
+  // always a substring of matching control's id=''
   var c;
   for (c=0; c < requiredConnectionElements.length; c++){
     var re = new RegExp(requiredConnectionElements[c]);
-    var mtch = eId.match(re);
+    var mtch = elem.id.match(re);
     if (mtch != null && mtch.length > 0)
       break;
   }
@@ -152,27 +241,56 @@ function onfocusBehavior(elem){
 
   var lastToCheck = c-1;
   for (c=0; c <= lastToCheck; c++){
-    var ck = $("connection_" + requiredConnectionElements[c] + "_id");
-    if (ck.value == null || ck.value == "")
-      flagConnectionAsRequired(requiredConnectionElements[c]);
-    else
+    var hasAValue = false;
+    var equivalentIds = controlIds[c];
+
+     perControlLoop:
+    for (var cn=0; cn < equivalentIds.length; cn++){
+
+      control = $(equivalentIds[cn]);
+      if (control.disabled)
+        continue perControlLoop;
+
+      if (controlTypes[c][cn] == "checked"){
+        if (control.checked == true){
+          hasAValue = true;
+          break;
+        }
+      }
+      else { // Type == "value"
+        if (control.value != null && control.value != ""){
+          hasAValue = true;
+          break;
+        }
+      }
+    }
+
+    if (hasAValue)
       clearError(requiredConnectionElements[c]);
+    else
+      flagConnectionAsRequired(requiredConnectionElements[c]);
   }
   refreshSubmitState();
 }
 
 function flagConnectionAsRequired(elemName){
   connectionFormErrors[elemName] = true;
-  $(elemName + "_required").className = "helpTextFlagged";
+  maybeSetTextClass(elemName, "helpTextFlagged");
   $(elemName + "_error_icon").src = "/images/error_error_icon.png";
 }
 
 function clearError(elemName){
   connectionFormErrors[elemName] = false;
-  $(elemName + "_required").className = "";
+  maybeSetTextClass(elemName, "");
   $(elemName + "_error_icon").src = "/images/blank_error_icon.png";
 }
 
+function maybeSetTextClass(elemName, newClass){
+  var requiredText = $(elemName + "_required");
+  if (requiredText)
+    requiredText.className = newClass
+}
+
 function refreshSubmitState(){
   var detectedAtLeastOneError = false;
   for (var c =0; c < requiredConnectionElements.length-1; c++)
@@ -216,3 +334,26 @@ function maybeShowErrorDialog(){
   }
   return accum;
 }
+
+function syncEnabledStateOfObjectControls(){
+  var scalarDisabled = !($('connection_kind_of_obj_scalar').checked);
+  $('connection_scalar_obj').disabled = scalarDisabled;
+  if (!scalarDisabled){
+    divToBlank('obj');
+    lastValue['obj'] = "";
+  }
+
+  var idDisabled = !($('connection_kind_of_obj_item')).checked;
+  control = $('connection_obj_id');
+  control.disabled = idDisabled;
+  if (!idDisabled && (control.value != lastValue['obj']) )
+    loadItemDescDiv('obj', control);
+}
+
+function setDescDivsWidths(names){
+  for (var c=0; c < names.length; c++){
+    var descDiv = $(names[c] + "_desc");
+    var w = $("connection_" + names[c] + "_id").getWidth();
+    descDiv.style.width  = w + "px";
+  }
+}