togo 0.4.0 → 0.4.1

data/lib/togo/admin/admin.rb

@@ -57,7 +57,7 @@ module Togo
         redirect "/#{@model.name}"
       rescue => detail
         @errors = detail.to_s
-        erb :edit
+        erb :new
       end
     end
 

data/lib/togo/admin/public/css/screen.css

@@ -157,34 +157,41 @@ body {
 #main form fieldset input[type=text]:focus {
     border: 1px solid #ABABAB;
 }
+#main form fieldset.many_to_many,
 #main form fieldset.belongs_to,
 #main form fieldset.has_n  {
     padding-right: 20px;
 }
+#main form fieldset.many_to_many input[type=text],
 #main form fieldset.belongs_to input[type=text],
 #main form fieldset.has_n input[type=text] {
     width: 190px;
 }
+#main form fieldset.many_to_many label,
 #main form fieldset.belongs_to label,
 #main form fieldset.has_n label {
     float: left;
 }
+#main form fieldset.many_to_many div.search,
 #main form fieldset.belongs_to div.search,
 #main form fieldset.has_n div.search {
     display: none;
     width: 100%;
     text-align: right;
 }
+#main form fieldset.many_to_many div.paging,
 #main form fieldset.belongs_to div.paging,
 #main form fieldset.has_n div.paging {
     float: right;
     margin-left: 10px;
     line-height: 30px;
 }
+#main form fieldset.many_to_many .checkbox,
 #main form fieldset.belongs_to .checkbox,
 #main form fieldset.has_n .checkbox {
     display: none;
 }
+#main form fieldset.many_to_many .active,
 #main form fieldset.belongs_to .active,
 #main form fieldset.has_n .active {
     display: table-cell;

data/lib/togo/admin/public/js/togo.js

@@ -221,7 +221,6 @@ AssociationManager.prototype.adjustRelatedList = function() {
 };
 
 AssociationManager.prototype.setToModifyState = function() {
-    console.log('setToModifyState');
     ajax({
         url: "/search/" + this.model,
         success: this.searchResultsHandler(this)
@@ -293,7 +292,6 @@ AssociationManager.prototype.tableHandler = function(handler) {
         if (e.target.getAttribute('type') == 'radio') {
             handler.relatedIds = {};
             handler.relatedIds[e.target.value] = e.target.checked;
-            console.log(handler.relatedIds);
         }
     };
 };
@@ -331,7 +329,6 @@ AssociationManager.prototype.searchResultsHandler = function(handler) {
         handler.pageCount = Math.ceil(handler.count/10);
         handler.pageCountField.innerHTML = handler.pageCount;
         handler.pageNumberField.innerHTML = handler.pageNumber;
-        console.log(data);
         if (data.results.length > 0) {
             var out = [];
             for (var i = 0, len = data.results.length; i < len; i++) {

data/lib/togo/admin/views/edit.erb

@@ -2,7 +2,7 @@
 <form action="/update/<%= @model.name %>/<%= @content.id %>" method="post" id="edit-form">
   <div class="wrapper">
     <% if @errors %><div id="save_errors" class="errors"><%= @errors %></div><% end %>
-    <% @model.form_properties.each do |p| %>
+    <% @model.get_form_properties.each do |p| %>
     <fieldset id="property-<%= p.name %>" class="<%= @model.field_class_for(p) %>">
       <%= @model.form_for(p,@content) %>
     </fieldset>

data/lib/togo/admin/views/index.erb

@@ -1,6 +1,6 @@
 <h1><%= @model.display_name %></h1>
 <div id="paging">
-    <%= @count %> items
+    <%= @count %> item<%= @count != 1 ? 's' : '' %>
   <% if @page_count > 1 %>
     Page <span class="page-number"><%= @p %></span> of <span class="page-count"><%= @page_count %></span>
     <% prev_link, next_link = paging_links(@p, @page_count, :q => params[:q]) %>
@@ -20,7 +20,7 @@
       <% if not @content.empty? %>
       <th></th>
       <% end %>
-      <% @model.list_properties.each do |p| %>
+      <% @model.get_list_properties.each do |p| %>
       <th><%= p.name.to_s.humanize.titleize %></th>
       <% end %>
     </tr>
@@ -28,13 +28,13 @@
   <tbody>
     <% if @content.empty? %>
     <tr>
-      <td colspan="<%= @model.list_properties.size %>"><% if params[:q] %>No results for '<%= params[:q] %>'<% else %>No content has been created yet.<% end %></td>
+      <td colspan="<%= @model.get_list_properties.size %>"><% if params[:q] %>No results for '<%= params[:q] %>'<% else %>No content has been created yet.<% end %></td>
     </tr>
     <% else %>
     <% @content.each do |c| %>
     <tr>
       <td class="checkbox"><input type="checkbox" name="selection[<%= c.id %>]" value="1" id="selection_<%= c.id %>" /></td>
-      <% @model.list_properties.each_with_index do |p,i| %>
+      <% @model.get_list_properties.each_with_index do |p,i| %>
       <td><% if i == 0 %><a href="/edit/<%= @model.name %>/<%= c.id %>"><%= c.send(p.name.to_sym) || '-' %></a><% else %><%= c.send(p.name.to_sym) %><% end %></td>
       <% end %>
     </tr>

data/lib/togo/admin/views/new.erb

@@ -1,9 +1,9 @@
 <h1><a href="/<%= @model.name %>"><%= @model.display_name %></a> / New</h1>
-<form action="/create/<%= @model.name %>" method="post">
+<form action="/create/<%= @model.name %>" method="post" id="edit-form">
   <div class="wrapper">
     <% if @errors %><div id="save_errors" class="errors"><%= @errors %></div><% end %>
-    <% @model.form_properties.each do |p| %>
-    <fieldset id="field_<%= p.name %>" class="<%= @model.field_class_for(p) %>">
+    <% @model.get_form_properties.each do |p| %>
+    <fieldset id="property-<%= p.name %>" class="<%= @model.field_class_for(p) %>">
       <%= @model.form_for(p,@content) %>
     </fieldset>
     <% end %>
@@ -12,3 +12,5 @@
     <button type="submit" class="create">Create</button>
   </div>
 </form>
+<script type="text/javascript" src="/js/edit.js"></script>
+

data/lib/togo/model/model.rb

@@ -9,6 +9,8 @@ module Togo
         base.extend ClassMethods
         base.send(:class_variable_set, :@@list_properties, [])
         base.send(:class_variable_set, :@@form_properties, [])
+        base.send(:class_variable_set, :@@user_list_properties, [])
+        base.send(:class_variable_set, :@@user_form_properties, [])
         base.send(:class_variable_set, :@@custom_form_templates, {})
         base.send(:class_variable_set, :@@property_options, {})
         if MODELS.include?(base) # support code reloading
@@ -22,12 +24,12 @@ module Togo
 
         # Let the user determine what properties to show in list view
         def list_properties(*args)
-          pick_properties(:list,*args)
+          class_variable_set(:@@user_list_properties, args.to_a)
         end
         
         # Let the user determine what properties to show in form view
         def form_properties(*args)
-          pick_properties(:form,*args)
+          class_variable_set(:@@user_form_properties, args.to_a)
         end
 
         def configure_property(property,opts = {})
@@ -52,9 +54,9 @@ module Togo
         def stage_content(content,attrs)
           content.attributes = properties.inject({}){|m,p| attrs[p.name.to_sym] ? m.merge!(p.name.to_sym => attrs[p.name.to_sym]) : m}
           relationships.each do |r| 
-            key = "related_#{r[0]}".to_sym
-            next if not attrs[key] or attrs[key] == 'unset'
-            content = RelationshipManager.new(content, r, :ids => attrs[key]).relate
+            val = attrs["related_#{r[0]}".to_sym]
+            next if not val or val == 'unset'
+            content = RelationshipManager.new(content, r, :ids => val).relate
           end
           content
         end
@@ -89,6 +91,14 @@ module Togo
           type_from_property(property)
         end
 
+        def get_list_properties
+          pick_properties(:list, class_variable_get(:@@user_list_properties))
+        end
+        
+        def get_form_properties
+          pick_properties(:form, class_variable_get(:@@user_form_properties))
+        end
+
         private
 
         def custom_template_for(property,template)
@@ -99,6 +109,8 @@ module Togo
           case property
             when ::DataMapper::Property
               Extlib::Inflection.demodulize(property.type || property.class).downcase # type seems to be deprecated in 1.0
+            when ::DataMapper::Associations::ManyToMany::Relationship
+              'many_to_many'
             when ::DataMapper::Associations::ManyToOne::Relationship
               'belongs_to'
             when ::DataMapper::Associations::OneToMany::Relationship
@@ -108,7 +120,7 @@ module Togo
           end
         end
 
-        def pick_properties(selection,*args)
+        def pick_properties(selection, args)
           if class_variable_get(:"@@#{selection}_properties").empty?
             args = shown_properties.map{|p| p.name} if args.empty?
             class_variable_set(:"@@#{selection}_properties", args.collect{|a| shown_properties.select{|s| s.name == a}.first}.compact)
@@ -117,7 +129,8 @@ module Togo
         end
 
         def shown_properties
-          properties.select{|p| not BLACKLIST.include?(p.name) and not p.name =~ /_id$/} + relationships.values
+          skip = relationships.values.collect{|r| r.through if r.respond_to?(:through) }.compact.uniq # don't include join models
+          properties.select{|p| not BLACKLIST.include?(p.name) and not p.name =~ /_id$/} + relationships.values.select{|r| not skip.include?(r)}
         end
 
         def search_properties

data/lib/togo/model/types/belongs_to.erb

@@ -15,23 +15,18 @@
   <thead>
     <tr>
       <th class="checkbox"></th>
-      <% related_model.list_properties.each do |p| %>
+      <% related_model.get_list_properties.each do |p| %>
       <th><%= p.name.to_s.humanize.titleize %></th>
       <% end %>
-      <% if related_model.list_properties.size < 2 %>
-      <th></th>
-      <% end %>
     </tr>
   </thead>
   <tfoot>
     <tr>
       <td class="checkbox"></td>
-      <td>
-        <span class="associated-count-display" style="<%= (content_count == 0 or content_count < 10) ? 'display: none;' : '' %>">
+      <td colspan="<%= related_model.get_form_properties.size-2 %>">
+        <span class="associated-count-display" style="display: none;">
           ...and <span class="associated-count"><%= content_count-related_content.size %></span> more associated items
         </span>
-      </td>
-      <td colspan="<%= related_model.form_properties.size-1 %>">
         <button class="association-modify">Modify</button>
       </td>
     </tr>
@@ -39,13 +34,13 @@
   <tbody>
     <% if related_content.empty? %>
     <tr>
-      <td colspan="<%= related_model.form_properties.size %>">No Content Associated.</td>
+      <td colspan="<%= related_model.get_form_properties.size %>">No Content Associated.</td>
     </tr>
     <% else %>
     <% related_content.each do |c| %>
     <tr>
       <td class="checkbox"><input type="radio" name="selection[<%= c.id %>]" value="<%= c.id %>" id="selection_<%= related_model.name %>_<%= c.id %>" checked="checked" /></td>
-      <% related_model.list_properties.each_with_index do |p,i| %>
+      <% related_model.get_list_properties.each_with_index do |p,i| %>
       <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= c.id %>"><%= c.send(p.name.to_sym) || '-' %></a><% else %><%= c.send(p.name.to_sym) %><% end %></td>
       <% end %>
     </tr>   
@@ -58,7 +53,7 @@
     relationship: 'belongs_to',
     name: '<%= property.name %>',
     model: '<%= related_model.name %>',
-    fields: <%= related_model.list_properties.map(&:name).to_json %>,
+    fields: <%= related_model.get_list_properties.map(&:name).to_json %>,
     count: <%= content_count %>,
     related_ids: <%= related_ids.to_json %>
   });

data/lib/togo/model/types/datetime.erb

@@ -1,2 +1,2 @@
 <label for="<%= property.name %>"><%= property.model.property_options[property.name][:label] rescue property.name.to_s.humanize.titleize %></label>
-<input type="text" name="<%= property.name %>" id="<%= property.name %>" value="<%= content.send(property.name.to_sym).strftime("%B %d, %Y %I:%M%p") rescue '' %>" />
+<input type="text" name="<%= property.name %>" id="<%= property.name %>" value="<%= (content.send(property.name.to_sym) || Time.now).strftime("%B %d, %Y %I:%M%p") %>" />

data/lib/togo/model/types/has_n.erb

@@ -15,7 +15,7 @@
   <thead>
     <tr>
       <th class="checkbox"></th>
-      <% related_model.list_properties.each do |p| %>
+      <% related_model.get_list_properties.each do |p| %>
       <th><%= p.name.to_s.humanize.titleize %></th>
       <% end %>
     </tr>
@@ -28,7 +28,7 @@
           ...and <span class="associated-count"><%= content_count-related_content.size %></span> more associated items
         </span>
       </td>
-      <td colspan="<%= related_model.form_properties.size-1 %>">
+      <td colspan="<%= related_model.get_form_properties.size-1 %>">
         <button class="association-modify">Modify</button>
       </td>
     </tr>
@@ -36,13 +36,13 @@
   <tbody>
     <% if related_content.empty? %>
     <tr>
-      <td colspan="<%= related_model.form_properties.size %>">No Content Associated.</td>
+      <td colspan="<%= related_model.get_form_properties.size %>">No Content Associated.</td>
     </tr>
     <% else %>
     <% related_content.each do |c| %>
     <tr>
       <td class="checkbox"><input type="checkbox" name="selection[<%= c.id %>]" value="<%= c.id %>" id="selection_<%= related_model.name %>_<%= c.id %>" checked="checked" /></td>
-      <% related_model.list_properties.each_with_index do |p,i| %>
+      <% related_model.get_list_properties.each_with_index do |p,i| %>
       <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= c.id %>"><%= c.send(p.name.to_sym) || '-' %></a><% else %><%= c.send(p.name.to_sym) %><% end %></td>
       <% end %>
     </tr>   
@@ -55,7 +55,7 @@
     relationship: 'has_n',
     name: '<%= property.name %>',
     model: '<%= related_model.name %>',
-    fields: <%= related_model.list_properties.map(&:name).to_json %>,
+    fields: <%= related_model.get_list_properties.map(&:name).to_json %>,
     count: <%= content_count %>,
     related_ids: <%= related_ids.to_json %>
   });

data/lib/togo/model/types/many_to_many.erb

@@ -0,0 +1,63 @@
+<% content_count = content.send(property.name.to_sym).size %>
+<% related_ids = content.send(property.name.to_sym).map(&:id) %>
+<% related_content = content.send(property.name.to_sym)[0...10] %>
+<% related_model = property.child_model %>
+<input type="hidden" name="related_<%= property.name %>" class="related_ids" value="unset" />
+<label for="<%= property.name %>"><%= related_model.display_name %></label>
+<div class="search" id="search-<%= related_model.name %>">
+  <input type="text" name="search-<%= property.name %>" value="Search..." />
+  <div class="paging">
+    Page <span class="page-number">1</span> of <span class="page-count"><%= (content_count/10).ceil %></span>
+    <a href="#" rel="prev">&laquo; Previous</a> <a href="#" rel="next">Next &raquo;</a>
+  </div>
+</div>
+<table>
+  <thead>
+    <tr>
+      <th class="checkbox"></th>
+      <% related_model.get_list_properties.each do |p| %>
+      <th><%= p.name.to_s.humanize.titleize %></th>
+      <% end %>
+    </tr>
+  </thead>
+  <tfoot>
+    <tr>
+      <td class="checkbox"></td>
+      <td>
+        <span class="associated-count-display" style="<%= (content_count == 0 or content_count < 10) ? 'display: none;' : '' %>">
+          ...and <span class="associated-count"><%= content_count-related_content.size %></span> more associated items
+        </span>
+      </td>
+      <td colspan="<%= related_model.get_form_properties.size-1 %>">
+        <button class="association-modify">Modify</button>
+      </td>
+    </tr>
+  </tfoot>
+  <tbody>
+    <% if related_content.empty? %>
+    <tr>
+      <td colspan="<%= related_model.get_form_properties.size %>">No Content Associated.</td>
+    </tr>
+    <% else %>
+    <% related_content.each do |c| %>
+    <tr>
+      <td class="checkbox"><input type="checkbox" name="selection[<%= c.id %>]" value="<%= c.id %>" id="selection_<%= related_model.name %>_<%= c.id %>" checked="checked" /></td>
+      <% related_model.get_list_properties.each_with_index do |p,i| %>
+      <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= c.id %>"><%= c.send(p.name.to_sym) || '-' %></a><% else %><%= c.send(p.name.to_sym) %><% end %></td>
+      <% end %>
+    </tr>   
+    <% end %>
+    <% end %>
+  </tbody>
+</table>
+<script type="text/javascript">
+  new AssociationManager({
+    relationship: 'many_to_many',
+    name: '<%= property.name %>',
+    model: '<%= related_model.name %>',
+    fields: <%= related_model.get_list_properties.map(&:name).to_json %>,
+    count: <%= content_count %>,
+    related_ids: <%= related_ids.to_json %>
+  });
+</script>
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: togo
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Matt King
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 -07:00
+date: 2010-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ files:
 - lib/togo/model/types/float.erb
 - lib/togo/model/types/has_n.erb
 - lib/togo/model/types/integer.erb
+- lib/togo/model/types/many_to_many.erb
 - lib/togo/model/types/string.erb
 - lib/togo/model/types/text.erb
 - lib/togo/model.rb