togo 0.6.1 → 0.6.2

data/lib/togo/admin/helpers.rb

@@ -23,20 +23,20 @@ module Helpers
   end
 
   def column_head_link(property, current_order, qs = {})
-    qs = hash_to_qs(qs)
-    new_order = (current_order[0] == property.name.to_sym ? (current_order[1] == :asc ? "desc" : "asc") : "asc")
-    link_class = current_order[0] == property.name.to_sym ? new_order : ''
-    "<a href=\"?o=#{[(property.name.to_s+'.'+new_order.to_s),qs].compact.join('&')}\" class=\"#{link_class}\">#{property.name.to_s.humanize.titleize}</a>"
+    if property.sortable
+      qs = hash_to_qs(qs)
+      new_order = (current_order[0] == property.name ? (current_order[1] == :asc ? "desc" : "asc") : "asc")
+      link_class = current_order[0] == property.name ? new_order : ''
+      "<a href=\"?o=#{[(property.name.to_s+'.'+new_order.to_s),qs].compact.join('&')}\" class=\"#{link_class}\">#{property.label}</a>"
+    else
+      property.label
+    end
   end
 
   def partial(template, options={})
     erb template, options.merge(:layout => false)
   end
 
-  def active_menu(name)
-    request.path =~ /#{name}/ ? 'active' : ''
-  end
-
   def logged_in?
     return true if not config[:auth_model] or not config[:sessions]
     config[:auth_model] and session[:user] and session[:user].authenticated?

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

@@ -34,7 +34,8 @@
             <tr>
               <td class="checkbox"><input type="checkbox" name="selection[<%= c.id %>]" value="1" id="selection_<%= c.id %>" /></td>
               <% @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>
+                <% v = c.send(p.name.to_sym) || '-' %>
+                <td><% if i == 0 %><a href="/edit/<%= @model.name %>/<%= c.id %>"><%= v %></a><% else %><%= v %><% end %></td>
               <% end %>
             </tr>
           <% end %>

data/lib/togo/model/model.rb

@@ -2,6 +2,7 @@ require 'erubis/tiny'
 %w( relationship_manager many_to_one one_to_many ).each{|l|
   require "togo/model/relationship_manager/#{l}"
 }
+require 'togo/model/property_wrapper/property_wrapper'
 
 module Togo
   module DataMapper
@@ -44,7 +45,7 @@ module Togo
 
         # Display the form template for a property
         def form_for(property,content)
-          template = class_variable_get(:@@custom_form_templates)[property.name] || File.join(File.dirname(__FILE__),'types',"#{type_from_property(property)}.erb")
+          template = class_variable_get(:@@custom_form_templates)[property.name] || File.join(File.dirname(__FILE__),'types',"#{property.type}.erb")
           Erubis::TinyEruby.new(File.open(template).read).result(binding)
         end
 
@@ -95,7 +96,7 @@ module Togo
         end
 
         def field_class_for(property)
-          type_from_property(property)
+          property.type
         end
 
         def get_list_properties
@@ -131,10 +132,32 @@ module Togo
           end
         end
 
+        def model_from_property(property)
+          case property
+            when ::DataMapper::Property
+              property.model
+            when ::DataMapper::Associations::ManyToMany::Relationship
+              property.child_model
+            when ::DataMapper::Associations::ManyToOne::Relationship
+              property.parent_model
+            when ::DataMapper::Associations::OneToMany::Relationship
+              property.child_model
+            else
+              self
+          end
+        end
+
+        def sorting_from_property(property)
+          property.is_a?(::DataMapper::Property)
+        end
+
         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)
+            class_variable_set(:"@@#{selection}_properties", args.collect{|a|
+              p = shown_properties.select{|s| s.name == a}.first
+              PropertyWrapper.new({:property => p, :name => a, :type => type_from_property(p), :model => model_from_property(p), :sortable => sorting_from_property(p)})
+            }.compact)
           end
           class_variable_get(:"@@#{selection}_properties")
         end

data/lib/togo/model/property_wrapper/property_wrapper.rb

@@ -0,0 +1,21 @@
+class PropertyWrapper
+
+  attr_reader :name, :type, :model, :sortable
+
+  def initialize(opts = {})
+    @name = (opts[:property] ? opts[:property].name : opts[:name]).to_sym
+    @model = opts[:model]
+    @type = opts[:type]
+    @sortable = opts[:sortable] || false
+  end
+
+  def humanized_name
+    @name.to_s.humanize.titleize rescue @name
+  end
+
+  def label
+    puts @model.property_options.inspect
+    @model.property_options[@name][:label] rescue humanized_name
+  end
+
+end

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

@@ -1,7 +1,7 @@
-<% content_count = content.send(property.name.to_sym).blank? ? 0 : 1 %>
-<% related_content = [content.send(property.name.to_sym)].compact %>
+<% content_count = content.send(property.name).blank? ? 0 : 1 %>
+<% related_content = [content.send(property.name)].compact %>
 <% related_ids = related_content.map(&:id) %>
-<% related_model = property.parent_model %>
+<% related_model = property.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 %>">
@@ -17,7 +17,7 @@
         <tr>
           <th class="checkbox">&nbsp;</th>
           <% related_model.get_list_properties.each do |p| %>
-            <th><%= p.name.to_s.humanize.titleize %></th>
+            <th><%= p.humanized_name %></th>
           <% end %>
         </tr>
       </thead>
@@ -42,7 +42,8 @@
             <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.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>
+                <% v = c.send(p.name) || '-' %>
+                <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= c.id %>"><%= v || '-' %></a><% else %><%= v %><% end %></td>
               <% end %>
             </tr>   
           <% end %>

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

@@ -1,3 +1,3 @@
-<label><%= property.name.to_s.humanize.titleize %></label>
-<input type="radio" name="<%= property.name %>" id="<%= property.name %>_true" value="1" <% if content.send(property.name.to_sym) %> checked="checked"<% end %>/> <label class="inline" for="<%= property.name %>_true">Yes</label>
-<input type="radio" name="<%= property.name %>" id="<%= property.name %>_false" value="0" <% if not content.send(property.name.to_sym) %> checked="checked"<% end %>/> <label class="inline" for="<%= property.name %>_false">No</label>
+<label><%= property.label %></label>
+<input type="radio" name="<%= property.name %>" id="<%= property.name %>_true" value="1" <% if content.send(property.name) %> checked="checked"<% end %>/> <label class="inline" for="<%= property.name %>_true">Yes</label>
+<input type="radio" name="<%= property.name %>" id="<%= property.name %>_false" value="0" <% if not content.send(property.name) %> checked="checked"<% end %>/> <label class="inline" for="<%= property.name %>_false">No</label>

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) || Time.now).strftime("%B %d, %Y %I:%M%p") %>" />
+<label for="<%= property.name %>"><%= property.label %></label>
+<input type="text" name="<%= property.name %>" id="<%= property.name %>" value="<%= (content.send(property.name) || Time.now).strftime("%B %d, %Y %I:%M%p") %>" />

data/lib/togo/model/types/float.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) %>" />
+<label for="<%= property.name %>"><%= property.label %></label>
+<input type="text" name="<%= property.name %>" id="<%= property.name %>" value="<%= content.send(property.name) %>" />

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

@@ -1,7 +1,7 @@
-<% 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 %>
+<% content_count = content.send(property.name).size %>
+<% related_ids = content.send(property.name).map(&:id) %>
+<% related_content = content.send(property.name)[0...10] %>
+<% related_model = property.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 %>">
@@ -17,7 +17,7 @@
         <tr>
           <th class="checkbox">&nbsp;</th>
           <% related_model.get_list_properties.each do |p| %>
-            <th><%= p.name.to_s.humanize.titleize %></th>
+            <th><%= p.humanized_name %></th>
           <% end %>
         </tr>
       </thead>
@@ -44,7 +44,8 @@
             <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>
+                <% v = c.send(p.name) || '-' %>
+                <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= c.id %>"><%= v %></a><% else %><%= v %><% end %></td>
               <% end %>
             </tr>   
           <% end %>

data/lib/togo/model/types/integer.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) %>" />
+<label for="<%= property.name %>"><%= property.label %></label>
+<input type="text" name="<%= property.name %>" id="<%= property.name %>" value="<%= content.send(property.name) %>" />

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

@@ -1,7 +1,7 @@
-<% 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 %>
+<% content_count = content.send(property.name).size %>
+<% related_ids = content.send(property.name).map(&:id) %>
+<% related_content = content.send(property.name)[0...10] %>
+<% related_model = property.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 %>">
@@ -17,7 +17,7 @@
         <tr>
           <th class="checkbox">&nbsp;</th>
           <% related_model.get_list_properties.each do |p| %>
-            <th><%= p.name.to_s.humanize.titleize %></th>
+            <th><%= p.humanized_name %></th>
           <% end %>
         </tr>
       </thead>
@@ -44,7 +44,8 @@
             <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>
+                <% v = c.send(p.name) || '-' %>
+                <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= c.id %>"><%= v %></a><% else %><%= v %><% end %></td>
               <% end %>
             </tr>   
           <% end %>

data/lib/togo/model/types/string.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) %>" />
+<label for="<%= property.name %>"><%= property.label %></label>
+<input type="text" name="<%= property.name %>" id="<%= property.name %>" value="<%= content.send(property.name) %>" />

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

@@ -1,2 +1,2 @@
-<label for="<%= property.name %>"><%= property.model.property_options[property.name][:label] rescue property.name.to_s.humanize.titleize %></label>
-<textarea name="<%= property.name %>" id="<%= property.name %>" rows="10" cols="50"><%= content.send(property.name.to_sym) %></textarea>
+<label for="<%= property.name %>"><%= property.label %></label>
+<textarea name="<%= property.name %>" id="<%= property.name %>" rows="10" cols="50"><%= content.send(property.name) %></textarea>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: togo
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Matt King
@@ -15,29 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -08:00
+date: 2010-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 53
-        segments: 
-        - 0
-        - 10
-        - 1
-        version: 0.10.1
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: erubis
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -49,8 +33,8 @@ dependencies:
         - 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.
+  version_requirements: *id001
+description: With a few lines of code in your Ruby ORMs, you get a highly configurable and extensive content management tool (CMS).
 email: matt@mking.me
 executables: 
 - togo-admin
@@ -95,6 +79,7 @@ files:
 - lib/togo/dispatch/dispatch.rb
 - lib/togo/dispatch.rb
 - lib/togo/model/model.rb
+- lib/togo/model/property_wrapper/property_wrapper.rb
 - lib/togo/model/relationship_manager/many_to_one.rb
 - lib/togo/model/relationship_manager/one_to_many.rb
 - lib/togo/model/relationship_manager/relationship_manager.rb
@@ -147,6 +132,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Automatic Content Admin Tool for Ruby ORMs
+summary: CMS Framework for Ruby ORMs
 test_files: []