admin_data 1.0.21 → 1.0.22

data/Rakefile

@@ -44,3 +44,7 @@ begin
 rescue LoadError => le
   puts "Jeweler not available. Install it for jeweler-related tasks with: gem install jeweler: #{le.message}"
 end
+
+
+
+#TODO delete and destroy from show page do not provide any feedback

data/app/controllers/admin_data/main_controller.rb

@@ -8,7 +8,7 @@ class AdminData::MainController  < AdminData::BaseController
 
   before_filter :get_model_and_verify_it, :only => [:destroy, :del, :edit, :update, :show]
 
-  before_filter :ensure_is_allowed_to_view_klass, :except => [:all_models, :index]
+  before_filter :ensure_is_allowed_to_view_klass, :except => [:index]
 
   before_filter :ensure_is_allowed_to_update, :only => [:destroy, :del, :edit, :update, :create]
 
@@ -32,7 +32,7 @@ class AdminData::MainController  < AdminData::BaseController
     respond_to {|format| format.html}
   end
 
-  def all_models
+  def index
     respond_to {|format| format.html}
   end
 
@@ -69,12 +69,12 @@ class AdminData::MainController  < AdminData::BaseController
     model_name_underscored = @klass.name.underscore
     model_attrs = update_model_with_assoc(params[model_name_underscored])
     @columns = columns_list
-    
+
     respond_to do |format|
       if @model.update_attributes(model_attrs)
         format.html do
           flash[:success] = "Record was updated"
-          redirect_to admin_data_on_k_path(:id => @model, :klass => @klass.name.underscore)
+          redirect_to admin_data_path(:id => @model, :klass => @klass.name.underscore)
         end
         format.js { render :json => {:success => true}}
       else
@@ -97,7 +97,7 @@ class AdminData::MainController  < AdminData::BaseController
       else
         format.html do
           flash[:success] = "Record was created"
-          redirect_to admin_data_on_k_path(:id => @model, :klass => @klass.name.underscore)
+          redirect_to admin_data_path(:id => @model, :klass => @klass.name.underscore)
         end
         format.js { render :json => {} }
       end
@@ -105,18 +105,14 @@ class AdminData::MainController  < AdminData::BaseController
   end
 
   private
-  
+
   # If this class has any habtm relationships, update the parameters
   # in the model with the actual objects so they can be saved properly
+  # TODO write test for it
   def update_model_with_assoc(model_attrs)
-    if AdminData::Util.habtm_what(@klass).any? then
-      AdminData::Util.habtm_what(klass).each do |k|
-        assoc_klass = AdminData::Util.get_class_name_for_habtm_association(@model || @klass, k)
-        if model_attrs.include? assoc_klass.table_name then
-          model_attrs[assoc_klass.table_name].map! do |s|
-            assoc_klass.find(s.to_i)
-          end
-        end
+    AdminData::ActiveRecordUtil.habtm_klasses_for(klass).each do |k|
+      if model_attrs.include? k.table_name
+        model_attrs[k.table_name].map! { |s| k.find(s.to_i) }
       end
     end
     model_attrs

data/app/controllers/admin_data/public_controller.rb

@@ -3,16 +3,25 @@ class AdminData::PublicController < AdminData::BaseController
 
   def serve
     f = File.join(AdminData::Config.setting[:plugin_dir], 'lib', params[:file])
-    if not File.exists? f then
-      return render :nothing => true, :status => 404
+
+    unless File.exists?(f)
+      render :nothing => true, :status => 404 and return
     end
+
     opts = {:text => File.new(f).read, :cache => true}
-    if f =~ /css$/ then
+    if f =~ /css$/ 
       opts[:content_type] = "text/css"
-    elsif f =~ /js$/ then
+    elsif f =~ /js$/
       opts[:content_type] = "text/javascript"
+    else
+      # this is needed so that a user is not able to get data by performing url like
+      # http://localhost:3000/admin_data/public/..%2F..%2F..%2F..%2F..%2F..%2F..%2F..%2Fetc%2Fpasswd
+      # Above url will try to get /etc/passwd
+      # 
+      # ensures that request file must end with js or css
+      render :nothing => true, :status => 404 and return
     end
     render opts
   end
 
-end
+end

data/app/controllers/admin_data/search_controller.rb

@@ -79,11 +79,11 @@ class AdminData::SearchController < AdminData::BaseController
         render :text => "#{params[:base]} is an invalid value", :status => :not_found
         return
       end
-      if AdminData::Util.has_many_what(model_klass).include?(params[:children]) || AdminData::Util.habtm_what(model_klass).include?(params[:children])
+      #TODO write test for this condition
+      if AdminData::ActiveRecordUtil.declared_has_many_association_names(model_klass).include?(params[:children]) || AdminData::ActiveRecordUtil.declared_habtm_association_names(model_klass).include?(params[:children])
         #proceed
       else
-        render :text => "#{params[:children]} is not a valid has_many association",
-        :status => :not_found
+        render :text => "#{params[:children]} is not a valid has_many association", :status => :not_found
         return
       end
     end

data/app/views/admin_data/main/association/_association_info.html.erb

@@ -1,7 +1,7 @@
 <div class="block rounded">
   <h3>Association Information</h3>
   <div class='content association_info'>
-    <% if AdminData::Util.association_info_size(klass) %>
+    <% if AdminData::ActiveRecordUtil.association_info_size(klass) %>
       <%= render 'admin_data/main/association/belongs_to_info' ,  :klass => klass, :model => model %>
       <%= render 'admin_data/main/association/has_one_info',      :klass => klass, :model => model %>
       <%= render 'admin_data/main/association/has_many_info' ,    :klass => klass, :model => model %> 

data/app/views/admin_data/main/association/_belongs_to_info.html.erb

@@ -1,4 +1,4 @@
-<% if AdminData::Util.belongs_to_what(klass).any? %>
+<% if AdminData::ActiveRecordUtil.declared_belongs_to_association_names(klass).any? %>
   <p class='belongs_to'>
     <strong>belongs_to :</strong> 
     &nbsp;      

data/app/views/admin_data/main/association/_habtm_info.html.erb

@@ -1,4 +1,4 @@
-<% if AdminData::Util.habtm_what(klass).any? %>
+<% if AdminData::ActiveRecordUtil.declared_habtm_association_names(klass).any? %>
   <p>
     <strong>has_and_belongs_to_many :</strong>
     <%= admin_data_habtm_data(model, klass).html_safe %>

data/app/views/admin_data/main/association/_has_many_info.html.erb

@@ -1,4 +1,4 @@
-<% if AdminData::Util.has_many_what(klass).any? %>
+<% if AdminData::ActiveRecordUtil.declared_has_many_association_names(klass).any? %>
   <p>
     <strong>has_many :</strong>
     <%= admin_data_has_many_data(model, klass).html_safe %>

data/app/views/admin_data/main/association/_has_one_info.html.erb

@@ -1,4 +1,4 @@
-<% if AdminData::Util.has_one_what(klass).any? %>
+<% if AdminData::ActiveRecordUtil.declared_has_one_association_names(klass).any? %>
   <p>
     <strong>has_one :</strong> 
     <%= admin_data_has_one(model, klass).html_safe %>

data/app/views/admin_data/main/edit.html.erb

@@ -12,7 +12,7 @@
 
     <div class="content rounded">          
       <div class="inner umbrella">
-        <% url = admin_data_on_k_path(:klass => @klass.name, :id => @model)  
+        <% url = admin_data_path(:klass => @klass.name, :id => @model)  
            html_options = {:class => 'form', :method => :put} %>
            <%= form_for @model, :as => @klass.name.underscore.to_sym, :url => url, :html=> html_options do |f| %>
           <%= render 'admin_data/shared/flash_message', :model => @model %>

data/app/views/admin_data/main/{all_models.html.erb → index.html.erb}

@@ -1,13 +1,16 @@
 <div id="main">
   <div class="block" id="block-tables">
     <div class="content rounded select_box">          
-      <h2 style='margin-left:0;'>Select from the drop down menu above</h2>
+      <h2 id='main_page_label'>Select from the drop down menu above</h2>
       <div class="clear"></div>
     </div>
   </div>
 </div>
 
 <style>
+  #main_page_label {
+    margin-left: 0;
+  }
   .select_box {
     padding: 15px;
   }

data/app/views/admin_data/main/misc/_form.html.erb

@@ -8,7 +8,7 @@
   </div>  
 <% end %>
 
-<% if AdminData::Util.habtm_what(klass).any? %>
+<% if AdminData::ActiveRecordUtil.declared_habtm_association_names(klass).any? %>
   <div class='data'>
     <%= admin_data_form_field_for_habtm_records(klass, @model, f, '').html_safe %>
   </div>

data/app/views/admin_data/main/misc/_modify_record.html.erb

@@ -3,14 +3,14 @@
     <h3>Modify Record</h3>
     <div style='padding-left:15px'>
       <p>
-        <%= link_to 'Edit', edit_admin_data_on_k_path(:klass => klass.name.underscore, :id => model) %> 
+        <%= link_to 'Edit', admin_data_edit_path(:klass => klass.name.underscore, :id => model) %> 
       </p>
       <p>
-        <%= link_to 'Delete', del_admin_data_on_k_path(:klass => klass.name.underscore, :id => model) ,
+        <%= link_to 'Delete', admin_data_del_path(:klass => klass.name.underscore, :id => model) ,
                { :confirm => ' You are deleting (not destroying) a record. Are you sure?', :method => :delete} %> 
       </p>
       <p>
-        <%= link_to "Destroy", admin_data_on_k_path(:klass => klass.name.underscore, :id => model), 
+        <%= link_to "Destroy", admin_data_path(:klass => klass.name.underscore, :id => model), 
               { :confirm => 'You are destroying a record. Are you sure?', :method => :delete} %>
       </p>
     </div>

data/app/views/admin_data/main/new.html.erb

@@ -14,7 +14,7 @@
       <div class="inner umbrella">
         <h1>Create a new record</h1>
         <%= form_for @model,  :as => @klass.name.underscore.to_sym, 
-                              :url  => admin_data_on_k_index_path(:klass => @klass.name), 
+                              :url  => admin_data_index_path(:klass => @klass.name), 
                               :html => {:class => 'form', :method => :post} do |f| %>
           <%= render 'admin_data/shared/flash_message', :model => @model %>
           <%= render 'admin_data/main/misc/form', :klass => @klass, :f => f %>

data/app/views/admin_data/search/search/_listing.html.erb

@@ -23,7 +23,7 @@
       <% AdminData::Util.columns_order(klass.name).each do |column| %>
         <td>
           <% if (column == klass.primary_key) %>
-            <%= link_to(record.send(column), admin_data_on_k_path(:klass => klass.name.underscore, :id => record)) %>
+            <%= link_to(record.send(column), admin_data_path(:klass => klass.name.underscore, :id => record)) %>
          <% else %>
             <%=h  admin_data_get_value_for_column(admin_data_column_native(klass, column), record) %>
           <% end %>  

data/app/views/admin_data/shared/_header.html.erb

@@ -7,7 +7,7 @@
       <%= link_to label.html_safe, '/' %> 
     </li>
     <li> 
-      <%= link_to AdminData::Config.setting[:app_name] , admin_data_index_path %> 
+      <%= link_to AdminData::Config.setting[:app_name] , '/admin_data' %> 
     </li>
   </ul>
 

data/app/views/admin_data/shared/_secondary_navigation.html.erb

@@ -16,12 +16,12 @@
   </li>
 
   <li class="<%=@table_structure_tab_active%>">
-    <%= link_to 'Table Structure', table_structure_admin_data_on_k_path(:klass => klass.name.underscore) %>
+    <%= link_to 'Table Structure', admin_data_table_structure_path(:klass => klass.name.underscore) %>
   </li>
   
   <% if admin_data_is_allowed_to_update? %>
     <li class="<%=@add_new_record_tab_active%>"> 
-      <%= link_to '+Add New Record', new_admin_data_on_k_path(:klass => klass.name.underscore) %>
+      <%= link_to '+Add New Record', admin_data_new_path(:klass => klass.name.underscore) %>
     </li>
   <% end %>  
   

data/config/routes.rb

@@ -1,31 +1,35 @@
 Rails.application.routes.draw do
 
   namespace(:admin_data) do
-
-    match '/' => "main#all_models", :as => :index
-
-    match '/migration' => "migration#index", :as => :migration_information
-    match '/jstest' => "migration#jstest", :as => :jstest
-
     match '/feed/:klasss' => "feed#index", :defaults => { :format =>'rss' }, :as => :feed
-
-    match '/quick_search/:klass' => "search#quick_search", :as => :search
-    match '/advance_search/:klass' => "search#advance_search", :as => :advance_search
-    
-    match '/public/*file' => "public#serve"
   end
 
-  scope '/admin_data' do
-    match '/klass/:klass/table_structure' => "admin_data/main#table_structure", :as => :table_structure_admin_data_on_k, :via => :get
-    match '/klass/(:klass(.:format))' => "admin_data/main#index", :as => :admin_data_on_k_index, :via => :get
-    match '/klass/(:klass(.:format))' => "admin_data/main#create", :as => :admin_data_on_k_index, :via => :post
-
-    match '/klass/:klass/new' => "admin_data/main#new", :as => :new_admin_data_on_k, :via => :get
-    match '/klass/:klass/:id/del' => "admin_data/main#del", :as => :del_admin_data_on_k, :via => :delete
-    match '/klass/:klass/:id/edit' => "admin_data/main#edit", :as => :edit_admin_data_on_k, :via => :get
-    match '/klass/:klass/:id' => "admin_data/main#show", :as => :admin_data_on_k, :via => :get
-    match '/klass/:klass/:id' => "admin_data/main#update", :as => :admin_data_on_k, :via => :put
-    match '/klass/:klass/:id' => "admin_data/main#destroy", :as => :admin_data_on_k, :via => :delete
+  namespace(:admin_data) do
+    scope :admin_data do
+
+      controller "main" do
+        match '/',                              :to => :index,            :as => :index
+        match '/klass/:klass/table_structure',  :to => :table_structure,  :as => :table_structure, :via => :get
+        match '/klass/(:klass)',                :to => :index,            :as => :index,           :via => :get
+        match '/klass/(:klass)',                :to => :create,           :as => :index,           :via => :post
+        match '/klass/:klass/new',              :to => :new,              :as => :new, :via => :get
+        match '/klass/:klass/:id/del',          :to => :del,              :as => :del, :via => :delete
+        match '/klass/:klass/:id/edit',         :to => :edit,             :as => :edit, :via => :get
+        match '/klass/:klass/:id',              :to => :show,             :via => :get
+        match '/klass/:klass/:id',              :to => :update,           :via => :put
+        match '/klass/:klass/:id',              :to => :destroy,          :via => :delete
+      end
+
+      controller "migration" do
+        match '/migration', :to => :index,  :as => :migration_information
+        match '/jstest',    :to => :jstest, :as => :jstest
+      end
+
+      match '/quick_search/:klass' => "search#quick_search", :as => :search
+      match '/advance_search/:klass' => "search#advance_search", :as => :advance_search
+      match '/public/*file' => "public#serve"
+
+    end
   end
 
-end
+end

data/lib/admin_data/active_record_util.rb

@@ -0,0 +1,62 @@
+module AdminData
+  class ActiveRecordUtil
+
+    def self.declared_habtm_association_names(klass)
+      delcared_association_names_for(klass, :has_and_belongs_to_many).map(&:name).map(&:to_s)
+    end
+
+    def self.declared_belongs_to_association_names(klass)
+      delcared_association_names_for(klass, :belongs_to).map(&:name).map(&:to_s)
+    end
+
+    def self.declared_has_one_association_names(klass)
+      delcared_association_names_for(klass, :has_one).map(&:name).map(&:to_s)
+    end
+
+    def self.declared_has_many_association_names(klass)
+      delcared_association_names_for(klass, :has_many).map(&:name).map(&:to_s)
+    end
+
+    # returns declared association names like
+    # #=> [comments]
+    # #=> [positive_comments]
+    # #=> [negative_comments]
+    def self.delcared_association_names_for(klass, association_type)
+      klass.name.camelize.constantize.reflections.values.select do |value|
+        value.macro == association_type
+      end
+    end
+
+    # returns an array of classes
+    # #=> [Comment]
+    def self.habtm_klasses_for(klass)
+      declared_habtm_association_names(klass).map do |assoc_name|
+        klass_for_association_type_and_name(klass, :has_and_belongs_to_many, assoc_name)
+      end
+    end
+
+    # returns a class or nil
+    #
+    # class User
+    #   has_many :comments
+    # end
+    #
+    # AdminData::ActiveRecordUtil.habtm_klass_for_association_name(User, 'comments') #=> Comment
+    def self.klass_for_association_type_and_name(klass, association_type, association_name)
+      data = klass.name.camelize.constantize.reflections.values.detect do |value|
+        value.macro == association_type && value.name.to_s == association_name
+      end
+      data.klass if data # output of detect from hash is an array with key and value
+    end
+    # TODO test with polymorphic
+
+
+    def self.association_info_size(k)
+      AdminData::ActiveRecordUtil.declared_belongs_to_association_names(k).any? ||
+      AdminData::ActiveRecordUtil.declared_has_many_association_names(k).any? ||
+      AdminData::ActiveRecordUtil.declared_has_many_association_names(k).any? ||
+      AdminData::ActiveRecordUtil.declared_habtm_association_names(k).any?
+    end
+
+  end
+end

data/lib/admin_data/chelper.rb

@@ -26,7 +26,7 @@ module AdminData::Chelper
 
   def admin_data_invalid_record_link(klassu, id, error)
     record = klassu.camelize.constantize.send(:find, id)
-    tmp = admin_data_on_k_path(:klass => klasss.underscore, :id => record)
+    tmp = admin_data_path(:klass => klasss.underscore, :id => record)
     a = []
     a << link_to(klasss, tmp, :target => '_blank')
     a << id

data/lib/admin_data/extension.rb

@@ -0,0 +1,21 @@
+class AdminData::Extension
+
+  def self.show_info(model)
+    return []
+    klass = model.class
+    if klass == User
+
+      if (habtm_klasses = AdminData::ActiveRecordUtil.habtm_klasses_for(klass)).any?
+        habtm_klasses.each do |k|
+          name = k.columns.map(&:name).include?('name') ? :name : k.primary_key
+          data << [ k.table_name, model.send(k.table_name).map{ |e|
+            view.link_to(e.send(name), view.admin_data_path(:klass => k, :id => e.send(k.primary_key)))
+          }.join(", ").html_safe ]
+        end
+      end
+    end
+
+  end # end of method
+
+
+end

data/lib/admin_data/helpers.rb

@@ -8,7 +8,7 @@ module AdminData::Helpers
     output = []
     if params[:base]
       label = params[:base].camelize + ' ID ' + params[:model_id]
-      output << link_to(label, admin_data_on_k_path(:klass => params[:base], :id => params[:model_id]))
+      output << link_to(label, admin_data_path(:klass => params[:base], :id => params[:model_id]))
       output << 'has'
       output << pluralize(total_num_of_children, params[:klass])
 
@@ -31,7 +31,7 @@ module AdminData::Helpers
 
   def admin_data_invalid_record_link(klassu, id, error)
     record = klassu.camelize.constantize.send(:find, id)
-    tmp = admin_data_on_k_path(:klass => klassu, :id => record)
+    tmp = admin_data_path(:klass => klassu, :id => record)
     a = []
     a << link_to(klassu.camelize, tmp, :target => '_blank')
     a << id
@@ -40,13 +40,12 @@ module AdminData::Helpers
   end
 
   def admin_data_has_one(model, klass)
-    tmp = AdminData::Util.has_one_what(klass)
+    tmp = AdminData::ActiveRecordUtil.declared_has_one_association_names(klass)
     tmp.inject('') do |output, ho|
       begin
         label = ho
         if model.send(ho)
-          has_one_klass_name = AdminData::Util.get_class_name_for_has_one_association(model, ho).name.underscore
-          output << link_to(label, admin_data_on_k_path(:klass => ho.underscore, :id => model.send(ho)))
+          output << link_to(label, admin_data_path(:klass => ho.underscore, :id => model.send(ho)))
         else
           output << label
         end
@@ -58,17 +57,17 @@ module AdminData::Helpers
   end
 
   def admin_data_has_many_data(model, klass)
-    array = AdminData::Util.has_many_what(klass).inject([]) do |output, hm|
+    array = AdminData::ActiveRecordUtil.declared_has_many_association_names(klass).map do |m|
       begin
-        label = hm + '(' + AdminData::Util.has_many_count(model,hm).to_s + ')'
-        if AdminData::Util.has_many_count(model,hm) > 0
-          has_many_klass_name = AdminData::Util.get_class_name_for_has_many_association(model,hm).name.underscore
-          output << link_to(label, admin_data_search_path(  :klass => has_many_klass_name,
-          :children => hm,
+        count = model.send(m.intern).count
+        label = m.to_s + '(' + count.to_s + ')'
+        output = label
+        if count > 0
+          has_many_klass_name = AdminData::ActiveRecordUtil.klass_for_association_type_and_name(model.class, :has_many, m).name.underscore
+          output = link_to(label, admin_data_search_path(  :klass => has_many_klass_name,
+          :children => m,
           :base => klass.name.underscore,
           :model_id => model.id))
-        else
-          output << label
         end
       rescue => e
         Rails.logger.debug AdminData::Util.exception_info(e)
@@ -79,55 +78,45 @@ module AdminData::Helpers
   end
 
   def admin_data_belongs_to_data(model, klass)
-    array = AdminData::Util.belongs_to_what(klass).inject([]) do |output, bt|
+    AdminData::ActiveRecordUtil.declared_belongs_to_association_names(klass).map do |assoc_name|
       begin
-        t = AdminData::Util.get_class_name_for_belongs_to_class(model, bt)
-        klass_name = t[:polymorphic] ? 'Polymorphic' : t[:klass_name]
-        belongs_to_record = model.send(bt)
-
-        if belongs_to_record && t[:polymorphic]
-          output << link_to(belongs_to_record.class.name,
-          admin_data_on_k_path(:klass => belongs_to_record.class.name.underscore, :id => belongs_to_record))
-        elsif belongs_to_record
-          output << link_to(bt, admin_data_on_k_path(:klass => klass_name.underscore, :id => model.send(bt)))
-        else
-          output << bt
+        output = assoc_name
+        if belongs_to_record = model.send(assoc_name)
+          output = link_to(assoc_name, admin_data_path(:klass => belongs_to_record.class.name.underscore, :id => belongs_to_record.id))
         end
       rescue => e
         Rails.logger.info AdminData::Util.exception_info(e)
       end
       output
-    end
-    array.join(', ')
+    end.join(', ')
   end
-  
+
   def admin_data_habtm_data(model, klass)
-    array = AdminData::Util.habtm_what(klass).inject([]) do |output, m|
-      # same as admin_data_has_many_data()
+    AdminData::ActiveRecordUtil.declared_habtm_association_names(klass).map do |assoc_name|
       begin
-        label = m + '(' + AdminData::Util.habtm_count(model, m).to_s + ')'
-        if AdminData::Util.habtm_count(model, m) > 0 then
-          has_many_klass_name = AdminData::Util.get_class_name_for_habtm_association(model,m).name.underscore
-          output << link_to(label, admin_data_search_path(  :klass => has_many_klass_name,
-                      :children => m,
-                      :base => klass.name.underscore,
-                      :model_id => model.id))
-        else
-          output << label
+        count = model.send(assoc_name.intern).count
+        label = assoc_name + '(' + count.to_s + ')'
+        output = label
+
+        if count > 0 then
+          has_many_klass_name = AdminData::ActiveRecordUtil.klass_for_association_type_and_name(model.class, :has_and_belongs_to_many, assoc_name).name.underscore
+          output = link_to(label, admin_data_search_path(  :klass => has_many_klass_name,
+          :children => assoc_name,
+          :base => klass.name.underscore,
+          :model_id => model.id))
         end
       rescue => e
         Rails.logger.info AdminData::Util.exception_info(e)
       end
       output
-    end
-    array.join(', ')
+    end.join(', ')
   end
-  
+
   def admin_data_habtm_values_for(model, klass)
-    assoc_klass = AdminData::Util.get_class_name_for_habtm_association(model, klass)
+    assoc_klass = AdminData::ActiveRecordUtil.klass_for_association_type_and_name(model, klass)
     name = assoc_klass.columns.map(&:name).include?('name') ? :name : assoc_klass.primary_key
-    model.send(assoc_klass.table_name).map{ |e| 
-      link_to(e.send(name), admin_data_on_k_path(:klass => assoc_klass, :id => e.id))
+    model.send(assoc_klass.table_name).map{ |e|
+      link_to(e.send(name), admin_data_path(:klass => assoc_klass, :id => e.id))
     }.join(", ").html_safe
   end
 
@@ -174,24 +163,24 @@ module AdminData::Helpers
       'could not retrieve' # returning nil
     end
   end
-  
+
   def admin_data_form_field_for_habtm_records(klass, model, f, html)
     begin
       html = []
-      AdminData::Util.habtm_what(klass).each do |k|
+      AdminData::ActiveRecordUtil.delcared_habtm_association_names(klass).each do |k|
         assoc_klass = AdminData::Util.get_class_name_for_habtm_association(model, k)
-        
+
         html << "<div class='col_box'>"
         html << "  <span class='col_name'>#{assoc_klass.table_name}</span>"
         html << "  <span class='col_type'>[integer]</span>"
         html << "</div>"
-        
+
         order_by = assoc_klass.columns.map(&:name).include?('name') ? :name : assoc_klass.primary_key
         all = assoc_klass.all(:order => order_by)
         selected = model.send(assoc_klass.table_name).map{|e| e.id}
-        html << f.collection_select(assoc_klass.table_name, all, :id, order_by, 
-              {:include_blank => false, :selected => selected}, 
-              {:multiple => true, :size => (all.count > 10 ? 8 : 4)})
+        html << f.collection_select(assoc_klass.table_name, all, :id, order_by,
+        {:include_blank => false, :selected => selected},
+        {:multiple => true, :size => (all.count > 10 ? 8 : 4)})
       end
       html.join
     rescue Exception => e
@@ -254,6 +243,7 @@ module AdminData::Helpers
   # uses truncate method
   # options supports :limit which is applied if the column type is string or text.
   # calls the inspect method to convert to a string if the column is serialized.
+  # TODO rspec test limit option
   def admin_data_get_value_for_column(column, model, options = {})
     options.reverse_merge!(:limit => 400)
 
@@ -270,22 +260,7 @@ module AdminData::Helpers
         '<actual data is not being shown because truncate method failed.>'
       end
     else
-
-      # check for an associated class id and add it's name to the value
-      ar = model.class.reflections.values.detect{ |v| v.primary_key_name == column.name}
-      if not ar.nil? then
-        name = ar.klass.columns.map(&:name).include?('name') ? :name : ar.klass.primary_key
-        assoc = model.send(ar.name)
-        if not name.nil? then
-          value = ("#{value} (" + 
-                  link_to(
-                    assoc.send(name), 
-                    admin_data_on_k_path(:klass => ar.klass, 
-                                              :id => assoc.send(ar.klass.primary_key))) + ")").html_safe
-        end
-      end
-      
-      value
+      value.inspect
     end
   end
 

data/lib/admin_data/util.rb

@@ -53,7 +53,8 @@ class AdminData::Util
       tmp = view.admin_data_get_value_for_column(column, model, :limit => nil)
       sum << [ column.name, (tmp.html_safe? ? tmp : view.send(:h,tmp)) ]
     end
-    data
+    extension = AdminData::Extension.show_info(model)
+    data + extension
   end
 
   def self.custom_value_for_column(column, model)
@@ -153,63 +154,6 @@ class AdminData::Util
     data.join("\n")
   end
   
-  def self.get_class_name_for_habtm_association(model, has_many_string)
-    klass = model.kind_of?(Class) ? model : model.class
-    data = klass.name.camelize.constantize.reflections.values.detect do |value|
-      value.macro == :has_and_belongs_to_many && value.name.to_s == has_many_string
-    end
-    data.klass if data # output of detect from hash is an array with key and value
-  end
-
-  def self.get_class_name_for_has_many_association(model, has_many_string)
-    data = model.class.name.camelize.constantize.reflections.values.detect do |value|
-      value.macro == :has_many && value.name.to_s == has_many_string
-    end
-    data.klass if data # output of detect from hash is an array with key and value
-  end
-
-  def self.get_class_name_for_belongs_to_class(model, belongs_to_string)
-    reflections = model.class.name.camelize.constantize.reflections
-    options = reflections.fetch(belongs_to_string.intern).send(:options)
-    return {:polymorphic => true} if options.keys.include?(:polymorphic) && options.fetch(:polymorphic)
-    {:klass_name => reflections[belongs_to_string.intern].klass.name }
-  end
-
-  def self.get_class_name_for_has_one_association(model, has_one_string)
-    data = model.class.name.camelize.constantize.reflections.values.detect do |value|
-      value.macro == :has_one && value.name.to_s == has_one_string
-    end
-    data.klass if data
-  end
-
-  def self.has_many_count(model, hm)
-    model.send(hm.intern).count
-  end
-
-  def self.has_many_what(klass)
-    associations_for(klass, :has_many).map(&:name).map(&:to_s)
-  end
-
-  def self.has_one_what(klass)
-    associations_for(klass, :has_one).map(&:name).map(&:to_s)
-  end
-
-  def self.belongs_to_what(klass)
-    associations_for(klass, :belongs_to).map(&:name).map(&:to_s)
-  end
-
-  def self.habtm_what(klass)
-    associations_for(klass, :has_and_belongs_to_many).map(&:name).map(&:to_s)
-  end
-  
-  def self.habtm_count(model, m)
-    model.send(m.intern).count
-  end
-
-  def self.association_info_size(k)
-    belongs_to_what(k).any? || has_many_what(k).any? || has_one_what(k).any? || habtm_what(k).any?
-  end
-
   def self.string_representation_of_data(value)
     case value
     when BigDecimal

data/lib/admin_data/version.rb

@@ -1,3 +1,3 @@
 module AdminData
-  VERSION = '1.0.21'
+  VERSION = '1.0.22'
 end

data/lib/admin_data.rb

@@ -15,7 +15,9 @@ require 'admin_data_date_validation'
 require 'admin_data/helpers'
 require 'admin_data/chelper'
 require 'admin_data/settings'
+require 'admin_data/extension'
 require 'admin_data/util'
+require 'admin_data/active_record_util'
 
 AdminData::Config.initialize_defaults
 ActionView::Base.send :include, AdminData::Helpers

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: admin_data
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 1
   - 0
-  - 21
-  version: 1.0.21
+  - 22
+  version: 1.0.22
 platform: ruby
 authors: 
 - Neeraj Singh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -05:00
+date: 2010-11-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,13 +116,13 @@ files:
 - app/controllers/admin_data/public_controller.rb
 - app/controllers/admin_data/search_controller.rb
 - app/views/admin_data/feed/index.rss.builder
-- app/views/admin_data/main/all_models.html.erb
 - app/views/admin_data/main/association/_association_info.html.erb
 - app/views/admin_data/main/association/_belongs_to_info.html.erb
 - app/views/admin_data/main/association/_habtm_info.html.erb
 - app/views/admin_data/main/association/_has_many_info.html.erb
 - app/views/admin_data/main/association/_has_one_info.html.erb
 - app/views/admin_data/main/edit.html.erb
+- app/views/admin_data/main/index.html.erb
 - app/views/admin_data/main/misc/_form.html.erb
 - app/views/admin_data/main/misc/_modify_record.html.erb
 - app/views/admin_data/main/new.html.erb
@@ -148,7 +148,9 @@ files:
 - app/views/layouts/admin_data.html.erb
 - config/routes.rb
 - lib/admin_data.rb
+- lib/admin_data/active_record_util.rb
 - lib/admin_data/chelper.rb
+- lib/admin_data/extension.rb
 - lib/admin_data/helpers.rb
 - lib/admin_data/railtie.rb
 - lib/admin_data/search.rb