wontomedia 1.0.0 → 1.0.1

data/Rakefile

@@ -72,7 +72,11 @@ ENDOSTRING
     #     log pkg tmp
     # aren't included because developers are expected to pull from Git
 
-    s.add_dependency 'rails', '~>2.2'
+    s.required_ruby_version = '~>1.8.7'
+    s.add_dependency 'rake',  '~>0.8.7'
+    s.add_dependency 'rails', '~>2.3.5'
+    # can't run w/o a database interface gem, but don't want to specify
+    # a 'mysql' dependency in case we're being used with something else
   end
 
   task :build => :gemspec    # don't build a gem from a stale spec

data/VERSION.yml

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

data/app/controllers/admin_controller.rb

@@ -196,7 +196,7 @@ PLAIN_XML
     Item.all.each do |item|
       result_text += "  <url>\n"
       result_text += "    <loc>#{item_by_name_url(item.name)}</loc>\n"
-      result_text += "    <lastmod>#{item.updated_at.to_s(:db)}</lastmod>\n"
+      result_text += "    <lastmod>#{item.updated_at.to_s(:w3c) }</lastmod>\n"
       result_text += "    <changefreq>monthly</changefreq>\n"
       priority = (item.flags & Item::DATA_IS_UNALTERABLE)==0 ? '1.0' : '0.1'
       result_text += "    <priority>#{priority}</priority>\n"
@@ -207,7 +207,7 @@ PLAIN_XML
       result_text += "  <url>\n"
       result_text += "    <loc>#{connection_url(connection)}</loc>\n"
       result_text += "    <lastmod>" +
-        "#{connection.updated_at.to_s(:db)}</lastmod>\n"
+        "#{connection.updated_at.to_s(:w3c)}</lastmod>\n"
       result_text += "    <changefreq>monthly</changefreq>\n"
       priority = (connection.flags & Connection::DATA_IS_UNALTERABLE)==0 ?
         '0.5' : '0.1'

data/app/controllers/items_controller.rb

@@ -102,6 +102,7 @@ class ItemsController < ApplicationController
     params[:item].delete :sti_type # don't mass-assign protected blah, blah
 
     @item = ItemHelper.new_typed_item(type_string, params[:item])
+    @example = get_an_example_of @item
     @popup_flag = true if params[:popup_flag]
 
     if @item.nil?
@@ -564,7 +565,28 @@ private
     class_to_item_map
   end
 
+  def get_an_example_of( proto_item )
+    if proto_item && proto_item.class_item_id
+      connections_to_instances = Connection.all( :conditions => [
+        "(flags & #{Connection::DATA_IS_UNALTERABLE}) = 0 AND " +
+          "predicate_id = ? AND obj_id = ?",
+        Item.find_by_name('is_instance_of'), proto_item.class_item_id ] )
+
+      # TODO: replace with .choice when we migrate to Ruby 1.9
+      len = connections_to_instances.length
+      connection = connections_to_instances[ rand(len) ]
+      if connection
+        return Item.find_by_id connection.subject_id
+      end
+    end
+
+    item = Item.last( :conditions => [
+      "(flags & #{Item::DATA_IS_UNALTERABLE}) = 0" ])
+    return item ? item : Item.last()   # make sure an empty install still works
+  end
+
   def setup_for_form
+    @example = get_an_example_of @item
     @class_list = all_class_items
     @class_to_item_map = map_of_item_types_for_class_items @class_list
     @this_is_non_information_page = true

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

@@ -18,11 +18,15 @@
 %>
 
 
-<p class="inputpara">
-  <%= f.label :title %>
+<p class="inputpara" style="position: relative;">
+  <span style="font-size: 120%; font-weight: bold;"><%=
+    f.label :title -%></span>
   <%= popup_help_icon "Help for title", "Help:Popup/ItemTitle" %>
   <%= image_tag "blank_error_icon.png", :id=>"title_error_icon", :alt=>"",
         :size=>"16x16" -%>
+  <span style="position: absolute; left: 10em; top: 0.3ex; height: 1ex; white-space: nowrap;">
+    <i>for example:</i>"<%= h @example.title -%>"
+  </span>
   <br />
   <%= f.text_field :title, :tabindex => "120", :style => "width: 75%;" %>
 </p><p class="directions">
@@ -34,13 +38,16 @@
   in small spaces.
 </p>
 
-<p class="inputpara">
-  <%= f.label :name %>
+<p class="inputpara" style="position: relative;">
+  <span style="font-size: 120%; font-weight: bold;"><%= f.label :name %></span>
   <%= popup_help_icon "Help for name", "Help:Popup/ItemName" %>
   <%= image_tag "blank_error_icon.png", :id=>"name_error_icon", :alt=>"",
         :size=>"16x16" %>
   <%= image_tag "blank_status_icon.png", :id=>"name_status_icon", :alt=>"",
         :size=>"32x16" %>
+  <span style="position: absolute; left: 10em; top: 0.3ex;">
+    <i>for example:</i>"<%= h @example.name -%>"
+  </span>
   <br />
   <%= f.text_field :name, :tabindex => "130", :style => "width: 55%;" %>
 </p><p class="directions">
@@ -54,7 +61,8 @@
 </p>
 
 <p class="inputpara">
-  <%= f.label :description %>
+  <span style="font-size: 120%; font-weight: bold;"><%=
+    f.label :description -%></span>
   <%= popup_help_icon "Help for description", "Help:Popup/ItemDescription" %>
   <%= image_tag "blank_error_icon.png", :id=>"description_error_icon", :alt=>"",
         :size=>"16x16" %>

data/app/views/layouts/_master_help.html.erb

@@ -17,6 +17,6 @@
 # see "http://www.gnu.org/licenses/".
 %>
 
-<div id="block-help">
+<div id="block-help"><span>
   <%= link_to 'Help', WontoMedia.help_url_prefix + "Help:Main_Page" %>
-</div>
+</span></div>

data/app/views/layouts/_search_box.html.erb

@@ -18,24 +18,33 @@
 %>
 
 
-<% if WontoMedia.search.google_site_search  and
-      WontoMedia.search.publisher_id        and
-      WontoMedia.search.search_engine           %>
-  <div id="block-search">
-    <form action="/w/search" id="cse-search-box">
-      <div>
-        <input type="hidden" name="cx"
-          value="<%=
-            WontoMedia.search.publisher_id + ':' +
-            WontoMedia.search.search_engine -%>" />
-        <input type="hidden" name="cof" value="FORID:10" />
-        <input type="hidden" name="ie" value="ISO-8859-1" />
-        <input type="text" name="q" size="20" />
-        <input type="submit" name="sa" value="Search" />
+<% unless RAILS_ENV == 'test'
+    if WontoMedia.search.google_site_search  and
+          WontoMedia.search.publisher_id        and
+          WontoMedia.search.search_engine           %>
+      <div id="block-search"></div>
+      <script>
+        addToDivsToMove('block-search');
+      </script>
+
+      <% content_for :last_bottom_page_js do %>
+        <div id="block-search-content" style="display: none;">
+          <form action="/w/search" id="cse-search-box">
+            <div>
+              <input type="hidden" name="cx"
+                value="<%=
+                  WontoMedia.search.publisher_id + ':' +
+                  WontoMedia.search.search_engine -%>" />
+              <input type="hidden" name="cof" value="FORID:10" />
+              <input type="hidden" name="ie" value="ISO-8859-1" />
+              <input type="text" name="q" size="20" />
+              <input type="submit" name="sa" value="Search" />
+            </div>
+          </form>
+          <script type="text/javascript"
+            src="http://www.google.com/cse/brand?form=cse-search-box&amp;lang=en"
+          ></script>
       </div>
-    </form>
-    <script type="text/javascript"
-      src="http://www.google.com/cse/brand?form=cse-search-box&amp;lang=en"
-    ></script>
-  </div>
+    <% end %>
+  <% end %>
 <% end %>

data/app/views/layouts/base.html.erb

@@ -51,6 +51,16 @@
     <% else %>
       <%= javascript_include_merged :top %>
     <% end %>
+    <% unless RAILS_ENV == 'test'
+         if WontoMedia.analytics and
+            WontoMedia.analytics.google and
+            WontoMedia.analytics.google.profile_id %>
+           <script type="text/javascript">
+             window.google_analytics_uacct =
+               "<%= WontoMedia.analytics.google.profile_id -%>";
+           </script>
+<%       end
+       end %>
 
     <%= yield :head %>
   </head>

data/config/initializers/extensions.rb

@@ -0,0 +1,24 @@
+# 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/>.
+
+
+# allow us to convert to "W3C Datetime" format
+#   http://www.w3.org/TR/NOTE-datetime
+Time::DATE_FORMATS[:w3c] =
+  lambda { |date| date.strftime( "%Y-%m-%dT%H:%M:%SZ" ) }
+
+

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

@@ -260,7 +260,9 @@ p + table {   margin-bottom: 1.5em;  }
   border-style: none solid solid;
   background: url("/images/transparent_ltblue_background.png") repeat;
   padding: 0 0.3em;
-  height: 2.7ex;
+  height: 5.8ex;
+}
+#block-help span {
   font-size: 200%;
 }
 

data/doc/gemlist.txt

@@ -0,0 +1,42 @@
+The following are the gems installed the last time a full regression
+test and exercise of the complete WontoMedia installation process was
+conducted.
+
+Note: there seems to be some incompatibility with json-1.2.3, but
+otherwise all gems are the latest as of build time.
+
+
+
+actionmailer (2.3.5)
+actionpack (2.3.5)
+activerecord (2.3.5)
+activeresource (2.3.5)
+activesupport (2.3.5)
+builder (2.1.2)
+cgi_multipart_eof_fix (2.5.0)
+cucumber (0.6.3)
+cucumber-rails (0.3.0)
+daemons (1.0.10)
+diff-lcs (1.1.2)
+fastthread (1.0.7)
+gem_plugin (0.2.3)
+git (1.2.5)
+json_pure (1.2.2)
+migration_test_helper (1.3.3)
+mongrel (1.1.5)
+mysql (2.8.1)
+nokogiri (1.4.1)
+polyglot (0.3.0)
+rack (1.0.1)
+rack-test (0.5.3)
+rails (2.3.5)
+rake (0.8.7)
+rspec (1.3.0)
+rspec-rails (1.3.2)
+rubyforge (2.0.4)
+selenium-client (1.2.18)
+technicalpickles-jeweler (1.2.1)
+term-ansicolor (1.0.5)
+treetop (1.4.4)
+webrat (0.7.0)
+ZenTest (4.2.1)

data/public/javascripts/forItemsForms.js

@@ -145,7 +145,7 @@ function plumbEventHandlersToItemCreationElements(customizationSelector){
     checkFieldLength(b, indexTitle);
     maybeClearIcon('title');
     if (creatingNewItem){
-      var emptyToNotEmpty = generateFromTitle(b, c);
+      var emptyToNotEmpty = generateFromTitle(b, c, checkName);
       if (emptyToNotEmpty){
         itemFormErrors["item_name"] = false;
         $('name_required').className = "";

data/public/javascripts/itemCreatePopup.js

@@ -82,6 +82,9 @@ function itemCreatePopup_Cancel(){
 }
 
 function itemCreatePopup_MakeSelection(){
+    // close Modalbox
+  Modalbox.hide();
+
   if (!($('MB_content').innerHTML.match(
       /Item\s+was\s+successfully\s+created/i))){
     itemSelectElementHavingNewItemAdded.value =
@@ -108,6 +111,28 @@ function itemCreatePopup_MakeSelection(){
 
     // make new item the selection in the operation-originating <select> control
   itemSelectElementHavingNewItemAdded.value = idNo;
+
+  // kludge for Safari:  WebKit (as-of Safari 4.0.4 3/2010) doesn't redisplay
+  // a <select> control when it's value is manipulated from JavaScript, even
+  // though the form will sumit correctly.  So, to force a redisplay, we
+  // remove the DOM node for the alread-set select control from the page, and
+  // then put it back.  Complexity arises from the fact it isn't the only
+  // element in its container; final "appendChild" is backup in case the
+  // complexity fails somehow.
+  var ourSelectControl = itemSelectElementHavingNewItemAdded;
+  var parent = ourSelectControl.parentNode;
+  var ourFollowingSibling = null;
+  for (var c=0; c < parent.childNodes.length; c++)
+    if (parent.childNodes[c] == ourSelectControl){
+      ourFollowingSibling = parent.childNodes[c+1]
+      break;
+    }
+  parent.removeChild(ourSelectControl);
+  if (ourFollowingSibling)
+    parent.insertBefore(ourSelectControl, ourFollowingSibling);
+  else
+    parent.appendChild(ourSelectControl);
+
   itemSelectElementHavingNewItemAdded.simulate('change');
   // Note: we're being lazy.  Just setting the value will cause an Ajax
   //    fetch to the server for the item's description.  However, we've
@@ -115,8 +140,5 @@ function itemCreatePopup_MakeSelection(){
   //    interrogating for idNo, name, and title.  However, supressing this
   //    fetch would take several lines of code and establish a tight linkage
   //    between here and the on-change logic for <select> elements.
-
-    // close Modalbox
-  Modalbox.hide();
 }
 

data/public/javascripts/itemTitleToName.js

@@ -23,7 +23,7 @@
 //   the function 'getCurrentType()'
 
 
-function generateFromTitle(titleInputElem, nameInputElem){
+function generateFromTitle(titleInputElem, nameInputElem, checkNameFn){
   var result = false;
   if (genNameFromTitleOk && titleInputElem.value != null){
     if (nameInputElem.value == null ||
@@ -32,6 +32,8 @@ function generateFromTitle(titleInputElem, nameInputElem){
 
     nameInputElem.value = genNameValue(titleInputElem.value);
     clearNameUniquenessIndicators();
+    if (checkNameFn)
+      checkNameFn();
   }
   return result;
 }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Glen E. Ivey
@@ -14,22 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -07:00
+date: 2010-03-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 2
-        version: "2.2"
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
+  type: :runtime
+  version_requirements: *id002
 description: "      WontoMedia is a Ruby-on-Rails web app for community creation of\n      an information classification scheme.  WontoMedia is free\n      software (licensed under the AGPL v3), and is being developed by\n      a dispersed volunteer team using agile methods.\n"
 email: gleneivey@wontology.org
 executables: []
@@ -113,6 +128,7 @@ files:
 - config/environments/development.rb
 - config/environments/production.rb
 - config/environments/test.rb
+- config/initializers/extensions.rb
 - config/initializers/inflections.rb
 - config/initializers/mime_types.rb
 - config/initializers/new_rails_defaults.rb
@@ -142,6 +158,7 @@ files:
 - doc/README.markdown
 - doc/README_FOR_APP
 - doc/customization.markdown
+- doc/gemlist.txt
 - doc/scripts/rake-customize.markdown
 - lib/helpers/connection_helper.rb
 - lib/helpers/item_helper.rb
@@ -269,11 +286,13 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ~>
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="