wontomedia 0.0.2 → 0.1.0

data/Rakefile

@@ -156,7 +156,7 @@ namespace :test do
         # now some new "umbrella" test tasks
 
   desc "Execute all development tests in test/unit."
-  Rake::TestTask.new(:dev => "db:test:prepare") do |t|
+  Rake::TestTask.new(:devs => "db:test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/unit/**/*_test.rb'
     t.verbose = true
@@ -170,16 +170,23 @@ namespace :test do
     ruby File.join( "policy", "ckFilesUtils", "ckCustomizationFilesPresent.rb" )
   end
 
+  # alias
+  task :integrations => :integration
+
   desc "Execute all the tests for Ruby code."
-  task :ruby => [ "test:dev", "test:dbmigrations", "test:functionals",
-    "test:integration", "build", "cucumber:static_ok"]
+  task :ruby_tests => [ "test:devs", "test:dbmigrations", "test:functionals",
+    "test:integrations", "build", "cucumber:static_ok"]
 end # namespace :test
 
 
 
-# redefine Rail's basic test task so that we get a reasonable execution order
+# replace Rail's basic test task so that we get a reasonable execution order
 Rake::Task[:test].clear!
 desc 'Run all unit, functional, integration, and policy checks'
-task :test => [ "test:policies", "asset:packager:build_all", "test:dev",
-                "test:dbmigrations", "test:functionals", "test:javascripts",
-                "test:integration", "build", "cucumber:ok" ]
+task :tests => [ "test:policies", "asset:packager:build_all",
+                    # above two have side effects necessary for setup
+                 "test:devs", "test:dbmigrations", "test:functionals",
+                 "test:javascripts", "test:integrations", "build",
+                 "cucumber:ok" ]
+# alias
+task :test => :tests

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 0
-:patch: 2
 :major: 0
+:minor: 1
+:patch: 0

data/app/controllers/admin_controller.rb

@@ -18,6 +18,7 @@
 #++
 
 
+require Rails.root.join( 'lib', 'helpers', 'item_helper')
 require 'yaml'
 
 # There is no model matching this controller.  It is intended to
@@ -28,8 +29,8 @@ class AdminController < ApplicationController
   # GET /admin/
   #
   # This action renders the primary administration page.  This page
-  # includes links to <tt>/items.yaml</tt> and
-  # <tt>/connections.n3</tt> so that an administrator can download the
+  # includes links to <tt>/w/items.yaml</tt> and
+  # <tt>/w/connections.n3</tt> so that an administrator can download the
   # complete content of a wontology for backup.  It also includes form
   # controls for uploading <tt>.yaml</tt> files of Item records and
   # <tt>.n3</tt> files of Connection records to be added to the
@@ -117,14 +118,14 @@ class AdminController < ApplicationController
           :flags     => 0
                      )
         if e.nil?
-          err_stry = "Couldn't create connection for #{$1} #{$2} #{$3}.\n"
+          err_str = "Couldn't create connection for #{$1} #{$2} #{$3}.\n"
           logger.error(err_str)
           flash[:error] << err_str
         else
           if e.save
             count += 1
           else
-            err_stry = "Couldn't save connection for #{$1} #{$2} #{$3}.\n"
+            err_str = "Couldn't save connection for #{$1} #{$2} #{$3}.\n"
             logger.error(err_str)
             flash[:error] << err_str
           end

data/app/controllers/items_controller.rb

@@ -107,19 +107,19 @@ class ItemsController < ApplicationController
       render :action => (@popup_flag ? "newpop" : "new" )
     else
       if @popup_flag
-        @connection_list = []; @item_hash = {}; @connection_hash = {}
+        @connection_list = []; @item_hash = {};
         flash.now[:notice] = 'Item was successfully created.'
         render :action => "show", :layout => "popup"
       else
         flash[:notice] = 'Item was successfully created.'
-        redirect_to item_path(@item)
+        redirect_to item_by_name_path(@item.name)
       end
     end
   end
 
   # GET /items/1
   #
-  # Note that +show+ is capable of rendering in multiple
+  # +show+ is capable of rendering in multiple
   # formats. <tt>/items/1</tt> and <tt>/items/1.html</tt> yield a
   # human-readable page in HTML markup.  <tt>/items/1.json</tt>
   # renders all fields from the specified Item as JSON-format text,
@@ -128,13 +128,91 @@ class ItemsController < ApplicationController
   # returned.  When a full web page is generated, information is
   # included about all other Items which are involved in Connections
   # that directly reference the requested Item.
+  #
+  # As for all controller actions, 'show' populates instance variables
+  # for the view to use in generating the page.  However, unlike most
+  # of the other controller methods, the data packaging that the show
+  # action does for the its view is relatively extensive and several
+  # instance variables are created:
+  #
+  # * *@item* this variable is populated with a single Item object
+  #   that holds the model for the page being generated
+  # * *@item_hash* is a hash that contains additional Item objects
+  #   that will be required to render the output page.  It is indexed
+  #   with Item.id values.
+  # * *@inverses_map* is a hash indexed by Connection objects which
+  #   contains other Connection objects.  Each time 'show' generates a
+  #   Connection object for one connection that is implied by the
+  #   existence of another connection involving *@item*, it creates an
+  #   entry in this hash.  The new entry is indexed by the new
+  #   Connection object (which has no "id" as it has not been saved to
+  #   the database) and whose value is the Connection object that
+  #   implies the new connection.  This allows the view to create
+  #   links to an implied connection's "source" connection without
+  #   having to go back through the database.
+  # * *@connection_list* is an _array_ of _arrays_ of Connection.id
+  #   values.  Each array within @connection_list represents a
+  #   different logically-similar group of connections, and they are
+  #   expected (although it is really up to the view) to be rendered
+  #   into the page from top to bottom in the order they occur in the
+  #   array.
+  #   - The first array of Connections inside of @connection_list
+  #     includes all connections that reference *@item* as their
+  #     subject item, _and_ which have a predicate item that inherits
+  #     from value_relationship.  (Assuming that's a non-empty set.)
+  #   - The next some-number-of arrays inside of @connection_list
+  #     contain (some of) the remaining Connections (if any) that
+  #     reference *@item* as their subject.  Connections are grouped
+  #     together based on their references to a common predicate item:
+  #     all of the Connections whose subject is *@item* and which have
+  #     the _same_ value for *predicate_id*.  Based on this definition,
+  #     all of the arrays in this portion of @connection_list will
+  #     have two or more element Connection objects.  The arrays in
+  #     this group are placed into @connection_list in order based on
+  #     the number of Connections in the array:  larger arrays are
+  #     sorted ahead of smaller ones.
+  #   - The next array in @connection_list, assuming there are
+  #     Connection objects for it, contains any Connections that
+  #     reference *@item* as their subject that haven't been included
+  #     in one of the arrays above.  Given the above definitions, the
+  #     view can expect that all of the *predicate_id* values in the
+  #     Connections in this array will be different.
+  #   - The next array in @connection_list contains all of the
+  #     Connection objects whose *object_id* values are equal to
+  #     *@item*.  Like all the other, this array won't be placed into
+  #     @connection_list if it would be empty.  Also, in the event of
+  #     that a Connection references *@item* as both its subject and
+  #     object, that Connection will be included in the appropriate
+  #     one of the preceding arrays.  (In generally, the criteria for
+  #     placing Connections into the individual arrays contained by
+  #     @connection_list are "greedy"; a Connection will be placed
+  #     in only one array, and it will be the earliest-generated array
+  #     for which it qualifies.)  Connections are sorted within this
+  #     array so that ones who share the same *predicate_id* value are
+  #     in adjacent positions.
+  #   - The final array that may be in @connection_list includes all
+  #     of the (remaining) Connections which, given the definitions
+  #     above, all reference *@item* as their predicate.
+  #
+  # Before connections are packaged and the items necessary for their
+  # display are gathered, the show action will create temporary,
+  # not-saved-to-the-database Connection objects to represent
+  # connections implied by existing connection that have the current
+  # *@item* as their object.  This allows implied connections to be
+  # included in the list of connections-with-@item-as-subject near the
+  # top of the list of *@item*'s connections.
   def show
     begin
-      @item = Item.find(params[:id])
+      @item = params[:name].nil? ?
+        Item.find(params[:id]) : Item.find_by_name(params[:name])
     rescue
       render :file => "#{RAILS_ROOT}/public/404.html", :status => 404
       return
     end
+    if @item.nil?
+      render :file => "#{RAILS_ROOT}/public/404.html", :status => 404
+      return
+    end
 
     if request.format.json?
       # huge kludge for testability.  Need to ensure that we don't respond
@@ -149,6 +227,7 @@ class ItemsController < ApplicationController
       return
     end
 
+    # all of the connections we might want to display
     used_as_subj = Connection.all( :conditions =>
       [ "subject_id = ?", @item.id ])
     used_as_pred = Connection.all( :conditions =>
@@ -156,42 +235,52 @@ class ItemsController < ApplicationController
     used_as_obj  = Connection.all( :conditions =>
       [ "obj_id = ?", @item.id ])
 
+    @inverses_map = {}
+    # create Connection objects for any implied connections we want to list
+    used_as_obj.each do |connection|
+      if inverse_property_id = TrippleNavigation.
+          propertys_inverse( connection.predicate_id )
+        new_connection = Connection.new(
+          :subject_id => connection.obj_id,
+          :predicate_id => inverse_property_id,
+          :obj_id => connection.subject_id
+        )
+        used_as_subj << new_connection
+        @inverses_map[new_connection] = connection
+      end
+    end
+
+    # find all of the Items referenced by the connections the view will list
     @item_hash = {}
-    @connection_hash = {}
     [ used_as_subj, used_as_pred, used_as_obj ].each do |connection_array|
       connection_array.each do |connection|
-        unless @connection_hash.has_key? connection.id
-          @connection_hash[connection.id] = connection
-          [ connection.subject, connection.predicate, connection.obj ].
-            each do |item|
-            unless @item_hash.has_key? item.id
-              @item_hash[item.id] = item
-            end
+        [ connection.subject, connection.predicate, connection.obj ].
+          each do |item|
+          unless @item_hash.has_key? item.id
+            @item_hash[item.id] = item
           end
         end
       end
     end
 
+
       # now that we've got all the connections to display, order and group them
     # @connection_list should be an array of arrays, each internal array is
     # a "section" of the display page, containing .id's of connections
     @connection_list = []
-
     value_id = Item.find_by_name("value_relationship").id
     spo_id   = Item.find_by_name("sub_property_of").id
 
     # first group, all connections *from* this item with value-type predicates
     connections = []
-    connections_to_delete = []
     used_as_subj.each do |connection|
       if TrippleNavigation.check_properties(
           :does => connection.predicate_id, :via => spo_id,
           :inherit_from => value_id )
-        connections << connection.id
-        connections_to_delete << connection
+        connections << connection
       end
     end
-    used_as_subj -= connections_to_delete # done incrementally, breaks iterator
+    used_as_subj -= connections # if done incrementally, breaks iterator
     unless connections.empty?
       @connection_list << connections
     end
@@ -208,7 +297,7 @@ class ItemsController < ApplicationController
       else
         pred_counts[connection.predicate_id] += 1
       end
-      connection_using_pred[connection.predicate_id] = connection.id
+      connection_using_pred[connection.predicate_id] = connection
     end
     subj_connections = pred_counts.keys
     subj_connections.sort! { |a,b| pred_counts[b] <=> pred_counts[a] }
@@ -219,7 +308,7 @@ class ItemsController < ApplicationController
         used_as_subj.each do |connection|
             # lazy, more hashes would eliminate rescan
           if connection.predicate_id == predicate_id
-            connections << connection.id
+            connections << connection
           end
         end
         unless connections.empty?
@@ -237,34 +326,38 @@ class ItemsController < ApplicationController
     end
 
 
-    obj_connections = used_as_obj.map { |connection| connection.id }
-    obj_connections.sort! do |a,b|
-      if @connection_hash[a].predicate_id == @connection_hash[b].predicate_id
-        @connection_hash[a].obj_id <=> @connection_hash[b].obj_id
+    used_as_obj.sort! do |a,b|
+      if a.predicate_id == b.predicate_id
+        a.obj_id <=> b.obj_id
       else
-        @connection_hash[a].predicate_id <=> @connection_hash[b].predicate_id
+        a.predicate_id <=> b.predicate_id
       end
     end
-    unless obj_connections.empty?
-      @connection_list << obj_connections
+    unless used_as_obj.empty?
+      @connection_list << used_as_obj
     end
 
 
-    pred_connections = used_as_pred.map { |connection| connection.id }
-    unless pred_connections.empty?
-      @connection_list << pred_connections
+    unless used_as_pred.empty?
+      @connection_list << used_as_pred
     end
   end
 
   # GET /items/1/edit
   def edit
     begin
-      @this_is_non_information_page = true
-      @item = Item.find(params[:id])
+      @item = params[:name].nil? ?
+        Item.find(params[:id]) : Item.find_by_name(params[:name])
     rescue
       render :file => "#{RAILS_ROOT}/public/404.html", :status => 404
       return
     end
+    if @item.nil?
+      render :file => "#{RAILS_ROOT}/public/404.html", :status => 404
+      return
+    end
+
+    @this_is_non_information_page = true
   end
 
   # PUT /items/1
@@ -286,7 +379,7 @@ class ItemsController < ApplicationController
 
     if (@item.flags & Item::DATA_IS_UNALTERABLE) != 0
       flash[:error] = 'This Item cannot be altered.'
-      redirect_to item_path(@item)
+      redirect_to item_by_name_path(@item.name)
     elsif (!params[:item].nil? && !params[:item][:name].nil? &&
           params[:item][:name] =~ /[:.]/                     )  ||
         !@item.update_attributes(params[:item])
@@ -295,7 +388,7 @@ class ItemsController < ApplicationController
       render :action => "edit"
     else
       flash[:notice] = 'Item was successfully updated.'
-      redirect_to item_path(@item)
+      redirect_to item_by_name_path(@item.name)
     end
   end
 
@@ -310,13 +403,13 @@ class ItemsController < ApplicationController
 
     if (@item.flags & Item::DATA_IS_UNALTERABLE) != 0
       flash[:error] = 'This Item cannot be altered.'
-      redirect_to item_path(@item)
+      redirect_to item_by_name_path(@item.name)
     elsif !(Connection.all( :conditions =>
         [ "subject_id = ? OR predicate_id = ? OR obj_id = ?",
           @item.id, @item.id, @item.id ]).empty?)
       flash[:error] = 'This Item is in use by 1+ Connections. ' +
         'Those must be modified or deleted first.'
-      redirect_to item_path(@item)
+      redirect_to item_by_name_path(@item.name)
     else
       @item.destroy
       redirect_to items_url

data/app/helpers/connections_helper.rb

@@ -64,4 +64,22 @@ module ConnectionsHelper
       @delete_help_icon_used = true
     end
   end
+
+  # This method appends its output directly to the page being built.
+  # It takes a Connection model instance and creates an HTML link to
+  # that connection.  It should be used as an alternative to
+  # "generate_connection_links()" for those cases where instead of
+  # generating links to the Connection the user is looking at, we're
+  # generating a link to the Connection that _implied_ whatever the
+  # user is looking at.  A popup help icon will be added on the first
+  # call to generate_inverse_link for a particular page.
+  def generate_inverse_link(con)
+    concat(
+      link_with_help_icon({
+        :destination => link_to( 'View source', connection_path(con) ),
+        :already_generated => @viewsource_help_icon_used,
+        :help_alt => 'Help view source',
+        :which_help =>'ConnectionViewSource' }) )
+    @viewsource_help_icon_used = true
+  end
 end

data/app/helpers/format_helper.rb

@@ -172,4 +172,10 @@ module FormatHelper
       ''
     end
   end
+
+  def site_content_url( page_name )
+    WontoMedia.site_content_url_prefix +
+    page_name +
+    WontoMedia.site_content_url_postfix
+  end
 end

data/app/helpers/items_helper.rb

@@ -33,12 +33,12 @@ module ItemsHelper
   # argument Item is different from the page's item, then the +title+
   # will be displayed as a link to _that_ Item's +show+ page.
   def self_string_or_other_link(item_id)
-    n = @item_hash[item_id]
-    title = h filter_parenthetical n.title
+    item = @item_hash[item_id]
+    title = h filter_parenthetical item.title
     if item_id == @item.id    # self
-      text_with_tooltip title, h( n.name )
+      text_with_tooltip title, h( item.name )
     else                      # other
-      link_with_tooltip title, h( n.name ), item_path(n)
+      link_with_tooltip title, h( item.name ), item_by_name_path(item.name)
     end
   end
 
@@ -82,8 +82,8 @@ module ItemsHelper
     if (item.flags & Item::DATA_IS_UNALTERABLE) == 0
       concat(
         link_with_help_icon({
-          :destination => link_to( 'Edit…', edit_item_path(item),
-            :rel => 'nofollow'),
+          :destination => link_to( 'Edit…',
+            edit_item_by_name_path(item.name), :rel => 'nofollow'),
         :already_generated => @edit_help_icon_used,
         :help_alt => 'Help edit item',
         :which_help => 'ItemEdit' }) )

data/app/views/admin/index.html.erb

@@ -69,6 +69,7 @@
   </p>
 <% end %>
 
-
-
-
+<hr>
+<pre>
+<%= `top -b -n 1` %>
+</pre>

data/app/views/connections/index.html.erb

@@ -57,15 +57,18 @@
     <% content_tag :tr, :id => connection.id do %>
       <td class='firstrow secondrow'><%=
         link_with_tooltip "#{h filter_parenthetical connection.subject.title}",
-          h( connection.subject.name ), item_path(connection.subject) -%></td>
+          h( connection.subject.name ),
+          item_by_name_path(connection.subject.name) -%></td>
       <td class='firstrow secondrow'><%=
         link_with_tooltip(
           "#{h filter_parenthetical connection.predicate.title}",
-          h( connection.predicate.name ), item_path(connection.predicate) )
+          h( connection.predicate.name ),
+          item_by_name_path(connection.predicate.name) )
       -%></td>
       <td class='firstrow secondrow'><%=
         link_with_tooltip "#{h filter_parenthetical connection.obj.title}",
-          h( connection.obj.name ), item_path(connection.obj) -%></td>
+          h( connection.obj.name ), item_by_name_path(connection.obj.name)
+       -%></td>
       <td class='firstrow secondrow' style="font-size: 80%">
         <% generate_connection_links(connection) %></td>
 <!--

data/app/views/connections/show.html.erb

@@ -43,7 +43,8 @@
   <tr><td>
     <b>Subject:</b>
   </td><td>
-      <%= link_to "<b>#{h @subject.title}</b>", item_path(@subject) %> &mdash;
+      <%= link_to "<b>#{h @subject.title}</b>",
+            item_by_name_path(@subject.name) %> &mdash;
       (<b><%= h @subject.name %></b>)
     <p>
       <%= h @subject.description %>
@@ -53,7 +54,8 @@
   <tr><td>
     <b>Predicate:</b>
   </td><td>
-      <%= link_to "<b>#{h @predicate.title}</b>", item_path(@predicate) %>
+      <%= link_to "<b>#{h @predicate.title}</b>",
+            item_by_name_path(@predicate.name) %>
       &mdash; (<b><%= h @predicate.name %></b>)
     <p>
       <%= h @predicate.description %>
@@ -63,8 +65,8 @@
   <tr><td>
     <b>Object:</b>
   </td><td>
-      <%= link_to "<b>#{h @obj.title}</b>", item_path(@obj) %> &mdash;
-      (<b><%= h @obj.name %></b>)
+      <%= link_to "<b>#{h @obj.title}</b>", item_by_name_path(@obj.name) %>
+      &mdash; (<b><%= h @obj.name %></b>)
     <p>
       <%= h @obj.description %>
     </p>

data/app/views/items/_content_examples.html.erb

@@ -40,7 +40,8 @@
 <% nouns_listed = 0
    @nouns.each do |item| %>
      <p class="item-title">
-       <%= link_to "#{h filter_parenthetical item.title}", item_path(item) %>
+       <%= link_to "#{h filter_parenthetical item.title}",
+             item_by_name_path(item.name) %>
      </p>
      <p class="item-desc">
        <% desc = h item.description

data/app/views/items/_show_outbound_links.html.erb

@@ -22,7 +22,7 @@
   <ul>
     <% if (@item.flags & Item::DATA_IS_UNALTERABLE) == 0 %>
       <li>
-        <%= link_to 'Edit this item', edit_item_path(@item),
+        <%= link_to 'Edit this item', edit_item_by_name_path(@item.name),
               :rel => 'nofollow' -%><%=
             popup_help_icon "Help edit items", "Help:Popup/ItemEdit" -%>
       </li>

data/app/views/items/edit.html.erb

@@ -43,7 +43,7 @@
 <% end %>
 
 <div class="horizontal-link-list"><ul>
-  <li><%= link_to 'Cancel,&nbsp;show&nbsp;item', item_path(@item),
+  <li><%= link_to 'Cancel,&nbsp;show&nbsp;item', item_by_name_path(@item.name),
             :rel => 'nofollow' -%></li>
   <li><%= link_to 'Cancel,&nbsp;show&nbsp;item&nbsp;list', items_path,
             :rel => 'nofollow' -%></li>

data/app/views/items/index.html.erb

@@ -53,7 +53,8 @@
     <% content_tag :tr, :id => h(item.name) do %>
       <td class="firstrow"><%= wrap_item_name h item.name -%></td>
       <td class="firstrow" style="font-weight: bold; width: 62%;">
-        <%= link_to filter_parenthetical(h item.title), item_path(item) -%></td>
+        <%= link_to filter_parenthetical(h item.title),
+              item_by_name_path(item.name) -%></td>
       <td class="firstrow" style="font-size: 80%;">
         <% generate_item_links(item) %>
       </td>

data/app/views/items/show.html.erb

@@ -102,11 +102,9 @@
          connection_array = array_of_arrays_of_connections.next
 
          # check ID of first connection's subject item against "this" item's ID
-         break if @connection_hash[connection_array[0]].subject_id != @item.id
-
-         connection_array.each do |connection_id|
-           e = @connection_hash[connection_id]
+         break if connection_array[0].subject_id != @item.id
 
+         connection_array.each do |connection|
            unless list_open_output
              list_open_output = true
 
@@ -124,28 +122,32 @@
                <ul style="list-style-type: none;">
 <%         end
 
-           if last_predicate_id != e.predicate_id
+           if last_predicate_id != connection.predicate_id
              if last_predicate_id %>
                  </ul>
                </li>
 <%           end %>
              <li>
-               <%= n = @item_hash[e.predicate_id]
-                   link_with_tooltip (h filter_parenthetical n.title ),
-                     h( n.name ), item_path(n) %>
+               <%= item = @item_hash[connection.predicate_id]
+                   link_with_tooltip (h filter_parenthetical item.title ),
+                     h( item.name ), item_by_name_path(item.name) %>
                <ul style="list-style-type: circle;">
 <%         end %>
 
            <li>
              <div style="float: right; font-size: 80%; margin-right: 6em;">
-               <%  generate_connection_links(e) %>
+               <% if connection.id
+                    generate_connection_links(connection)
+                  else
+                    generate_inverse_link(@inverses_map[connection])
+                  end %>
              </div>
-             <%= n = @item_hash[e.obj_id]
-                 link_with_tooltip (h filter_parenthetical n.title ),
-                   h( n.name ), item_path(n) %>
+             <%= item = @item_hash[connection.obj_id]
+                 link_with_tooltip (h filter_parenthetical item.title ),
+                   h( item.name ), item_by_name_path(item.name) %>
            </li>
 
-<%         last_predicate_id = e.predicate_id
+<%         last_predicate_id = connection.predicate_id
 
          end                       # .each over connection_array
        end                         # while over array-of-connection_array's
@@ -181,17 +183,20 @@
          end %>
 
          <tbody>
-           <% connection_array.each do |connection_id| %>
+           <% connection_array.each do |connection| %>
              <tr>
                <td>
-                 <%= e = @connection_hash[connection_id]
-                     self_string_or_other_link(e.subject_id) %>
+                 <%= self_string_or_other_link(connection.subject_id) %>
                </td><td class="connectioncolumn">
-                 <%= self_string_or_other_link(e.predicate_id) %>
+                 <%= self_string_or_other_link(connection.predicate_id) %>
                </td><td>
-                 <%= self_string_or_other_link(e.obj_id) %>
+                 <%= self_string_or_other_link(connection.obj_id) %>
                </td><td style="font-size: 80%">
-                 <% generate_connection_links(e) %>
+                 <% if connection.id
+                      generate_connection_links(connection)
+                    else
+                      generate_inverse_link(@inverses_map[connection])
+                    end %>
                </td>
              </tr>
            <% end %>