togo 0.2.0 → 0.3.1

data/README

@@ -4,6 +4,8 @@ With just a few lines of code in your ORM classes, you get a full-featured conte
 
 Quick example for DataMapper:
 
+require 'togo'
+
 class BlogEntry
   
   include DataMapper::Resource
@@ -20,4 +22,8 @@ class BlogEntry
 
 end
 
+Go to your app with your models in a folder called "models", then run:
+
+togo-admin
+
 Current only works with DataMapper.

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

@@ -150,6 +150,15 @@ body {
 #main form fieldset input[type=text]:focus {
     border: 1px solid #ABABAB;
 }
+#main form fieldset.belongs_to,
+#main form fieldset.has_n  {
+    padding-right: 20px;
+}
+#main form fieldset table th,
+#main form fieldset table td {
+    padding: 5px;
+}
+
 div.actions {
     position: absolute;
     bottom: 0;

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

@@ -3,7 +3,7 @@
   <div class="wrapper">
     <% if @errors %><div id="save_errors" class="errors"><%= @errors %></div><% end %>
     <% @model.form_properties.each do |p| %>
-    <fieldset id="property_<%= p.name %>">
+    <fieldset id="property_<%= p.name %>" class="<%= @model.field_class_for(p) %>">
       <%= @model.form_for(p,@content) %>
     </fieldset>
     <% end %>

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

@@ -3,7 +3,7 @@
   <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 %>">
+    <fieldset id="field_<%= p.name %>" class="<%= @model.field_class_for(p) %>">
       <%= @model.form_for(p,@content) %>
     </fieldset>
     <% end %>

data/lib/togo/admin.rb

@@ -2,6 +2,6 @@ require 'dispatch'
 require 'togo/admin/admin'
 
 Togo::Admin.configure({
-  :view_path => File.join(($:.find{|p| p =~ /lib\/togo\/admin/} || '../lib/togo/admin'),'views'),
-  :public_path => File.join(($:.find{|p| p =~ /lib\/togo\/admin/} || '../lib/togo/admin'),'public')
+  :view_path => File.join($:.find{|p| p =~ /lib\/togo\/admin/},'views'),
+  :public_path => File.join($:.find{|p| p =~ /lib\/togo\/admin/},'public')
 })

data/lib/togo/dispatch/dispatch.rb

@@ -43,13 +43,13 @@ module Togo
         @response.status = 404
         @response.write("404 Not Found")
       else
-        begin
+#         begin
           __before if defined? __before
           @response.write(send(method))
-        rescue => detail
-          @response.status = 500
-          @response.write("Error: #{detail}")
-        end
+#         rescue => detail
+#           @response.status = 500
+#           @response.write(["Error: #{detail}",$!.backtrace.join("<br />\n")].join("<br />\n"))
+#         end
       end
     end
     

data/lib/togo/model/model.rb

@@ -76,6 +76,10 @@ module Togo
           all(:conditions => [conditions.join(' OR ')] + values)
         end
 
+        def field_class_for(property)
+          type_from_property(property)
+        end
+
         private
 
         def custom_template_for(property,template)
@@ -88,6 +92,8 @@ module Togo
               Extlib::Inflection.demodulize(property.type).downcase
             when ::DataMapper::Associations::ManyToOne::Relationship
               'belongs_to'
+            when ::DataMapper::Associations::OneToMany::Relationship
+              'has_n'
             else
               'string'
           end

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

@@ -1,3 +1,29 @@
-<label for="<%= property.name %>"><%= property.name.to_s.humanize.titleize %></label>
-<input type="text" name="<%= property.name %>" id="<%= property.name %>" value="<%= content.send(property.name.to_sym) %>" />
-<input type="hidden" name="<%= property.child_key.first.name %>" id="<%= property.child_key.first.name %>" value="<%= content.send(property.name.to_sym).id rescue '' %>" />
+<% related_content = content.send(property.name.to_sym) %>
+<% related_model = property.parent_key.first.model %>
+<label for="<%= property.name %>"><%= property.name.to_s.humanize.titleize %> (<a href="/new/<%= related_model.name %>">New...</a>)</label>
+<table id="association-table">
+  <thead>
+    <tr>
+      <% if related_content %>
+      <th></th>
+      <% end %>
+      <% related_model.list_properties.each do |p| %>
+      <th><%= p.name.to_s.humanize.titleize %></th>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <% if not related_content %>
+    <tr>
+      <td colspan="<%= related_model.list_properties.size %>">No Content Associated.</td>
+    </tr>
+    <% else %>
+    <tr>
+      <td class="checkbox"><input type="checkbox" name="selection[<%= related_content.id %>]" value="1" id="selection_<%= related_content.id %>" /></td>
+      <% related_model.list_properties.each_with_index do |p,i| %>
+      <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= related_content.id %>"><%= related_content.send(p.name.to_sym) || '-' %></a><% else %><%= related_content.send(p.name.to_sym) %><% end %></td>
+      <% end %>
+    </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,31 @@
+<% related_content = content.send(property.name.to_sym)  %>
+<% related_model = property.child_key.first.model %>
+<label for="<%= property.name %>"><%= related_model.display_name %></label>
+<table id="association-table">
+  <thead>
+    <tr>
+      <% if related_content.empty? %>
+      <th></th>
+      <% end %>
+      <% related_model.list_properties.each do |p| %>
+      <th><%= p.name.to_s.humanize.titleize %></th>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <% if not related_content.empty? %>
+    <tr>
+      <td colspan="<%= related_model.list_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="1" id="selection_<%= c.id %>" /></td>
+      <% related_model.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>

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: togo
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  hash: 17
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Matt King
@@ -9,19 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-03 00:00:00 -08:00
+date: 2010-06-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 10
+        - 2
         version: 0.10.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: erubis
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 0
+        - 0
+        version: 0.0.0
+  type: :runtime
+  version_requirements: *id002
 description: With a few lines of code in your Ruby ORMs, you get a highly configurable and extensive content administration tool.
 email: matt@mattking.org
 executables: 
@@ -57,6 +85,7 @@ files:
 - lib/togo/model/types/boolean.erb
 - lib/togo/model/types/datetime.erb
 - lib/togo/model/types/float.erb
+- lib/togo/model/types/has_n.erb
 - lib/togo/model/types/integer.erb
 - lib/togo/model/types/string.erb
 - lib/togo/model/types/text.erb
@@ -77,21 +106,27 @@ require_paths:
 - lib/togo/dispatch
 - lib/togo/admin
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Automatic Content Admin Tool for Ruby ORMs