admin_data 1.0.19 → 1.0.21

data/History.txt

@@ -1,3 +1,6 @@
+=== 2010-11-08 v1.0.20
+* support for habtm
+* do not get the list of nested models. It breaks routing. Comprehensive nested models fix coming soon.
 
 === 2010-11-08 v1.0.19
 * used unscoped on the model to have basic search result always in the order user wants

data/app/controllers/admin_data/base_controller.rb

@@ -64,7 +64,7 @@ class AdminData::BaseController < ApplicationController
       return $admin_data_all_klasses
     else
       model_dir = File.join(Rails.root, 'app', 'models')
-      model_names = Dir.chdir(model_dir) { Dir["**/*.rb"] }
+      model_names = Dir.chdir(model_dir) { Dir["*.rb"] }
       klasses = get_klass_names(model_names)
       $admin_data_all_klasses = remove_klasses_without_table(klasses).sort_by {|r| r.name.underscore}
     end

data/app/controllers/admin_data/main_controller.rb

@@ -67,8 +67,9 @@ class AdminData::MainController  < AdminData::BaseController
 
   def update
     model_name_underscored = @klass.name.underscore
-    model_attrs = params[model_name_underscored]
+    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
@@ -85,7 +86,7 @@ class AdminData::MainController  < AdminData::BaseController
 
   def create
     model_name_underscored = @klass.name.underscore
-    model_attrs = params[model_name_underscored]
+    model_attrs = update_model_with_assoc(params[model_name_underscored])
     @model = @klass.create(model_attrs)
     @columns = columns_list
 
@@ -104,6 +105,22 @@ 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
+  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
+      end
+    end
+    model_attrs
+  end
 
   def get_model_and_verify_it
     primary_key = @klass.primary_key.intern

data/app/controllers/admin_data/public_controller.rb

@@ -0,0 +1,18 @@
+
+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
+    end
+    opts = {:text => File.new(f).read, :cache => true}
+    if f =~ /css$/ then
+      opts[:content_type] = "text/css"
+    elsif f =~ /js$/ then
+      opts[:content_type] = "text/javascript"
+    end
+    render opts
+  end
+
+end

data/app/controllers/admin_data/search_controller.rb

@@ -79,8 +79,10 @@ class AdminData::SearchController < AdminData::BaseController
         render :text => "#{params[:base]} is an invalid value", :status => :not_found
         return
       end
-      unless AdminData::Util.has_many_what(model_klass).include?(params[:children])
-        render :text => "<h2>#{params[:children]} is not a valid has_many association</h2>",
+      if AdminData::Util.has_many_what(model_klass).include?(params[:children]) || AdminData::Util.habtm_what(model_klass).include?(params[:children])
+        #proceed
+      else
+        render :text => "#{params[:children]} is not a valid has_many association",
         :status => :not_found
         return
       end

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

@@ -5,6 +5,7 @@
       <%= 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 %> 
+      <%= render 'admin_data/main/association/habtm_info' ,       :klass => klass, :model => model %>
     <% end %>
   </div>
 </div>

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

@@ -0,0 +1,7 @@
+<% if AdminData::Util.habtm_what(klass).any? %>
+  <p>
+    <strong>has_and_belongs_to_many :</strong>
+    <%= admin_data_habtm_data(model, klass).html_safe %>
+    &nbsp;
+  </p> 
+<% end %>  

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

@@ -8,6 +8,12 @@
   </div>  
 <% end %>
 
+<% if AdminData::Util.habtm_what(klass).any? %>
+  <div class='data'>
+    <%= admin_data_form_field_for_habtm_records(klass, @model, f, '').html_safe %>
+  </div>
+<% end %>
+
 <div class='group navform' style='padding-top:10px;'>
   <% if params[:action] == 'edit' || params[:action] == 'update' %>
     <% label = 'Update' %>

data/config/routes.rb

@@ -11,6 +11,8 @@ Rails.application.routes.draw do
 
     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

data/lib/admin_data/helpers.rb

@@ -100,6 +100,36 @@ module AdminData::Helpers
     end
     array.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()
+      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
+        end
+      rescue => e
+        Rails.logger.info AdminData::Util.exception_info(e)
+      end
+      output
+    end
+    array.join(', ')
+  end
+  
+  def admin_data_habtm_values_for(model, klass)
+    assoc_klass = AdminData::Util.get_class_name_for_habtm_association(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))
+    }.join(", ").html_safe
+  end
 
   def admin_data_breadcrum(&block)
     render(:partial => '/admin_data/shared/breadcrum', :locals => {:data => capture(&block)})
@@ -144,6 +174,31 @@ 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|
+        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)})
+      end
+      html.join
+    rescue Exception => e
+      Rails.logger.info AdminData::Util.exception_info(e)
+      'could not retrieve' # returning nil
+    end
+  end
 
   def admin_data_handle_column_type(col, html, model, column_value, f)
     case col.type
@@ -215,6 +270,21 @@ 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
     end
   end

data/lib/admin_data/util.rb

@@ -49,10 +49,11 @@ class AdminData::Util
 
 
   def self.label_values_pair_for(model, view)
-    model.class.columns.inject([]) do |sum, column|
+    data = model.class.columns.inject([]) do |sum, column|
       tmp = view.admin_data_get_value_for_column(column, model, :limit => nil)
-      sum << [column.name, view.send(:h,tmp)]
+      sum << [ column.name, (tmp.html_safe? ? tmp : view.send(:h,tmp)) ]
     end
+    data
   end
 
   def self.custom_value_for_column(column, model)
@@ -137,19 +138,27 @@ class AdminData::Util
   end
 
   def self.javascript_include_tag(*args)
-    data = args.inject('') do |sum, arg|
-      f = File.new(File.join(AdminData::Config.setting[:plugin_dir], 'lib', 'js', "#{arg}.js"))
-      sum << f.read
+    data = args.inject([]) do |sum, arg|
+      arg = "#{arg}.js" if arg !~ /js$/
+      sum << ['<script type="text/javascript" src="/admin_data/public/js/', arg, '"></script>'].join
     end
-    ['<script type="text/javascript">', data, '</script>'].join
+    data.join("\n")
   end
 
   def self.stylesheet_link_tag(*args)
-    data = args.inject('') do |sum, arg|
-      f = File.new(File.join(AdminData::Config.setting[:plugin_dir], 'lib', 'css', "#{arg}.css"))
-      sum << f.read
+    data = args.inject([]) do |sum, arg|
+      arg = "#{arg}.css" if arg !~ /css$/
+      sum << ['<link href="/admin_data/public/css/', arg, '" media="screen" rel="stylesheet" type="text/css" />'].join
     end
-    ["<style type='text/css'>", data, '</style>'].join
+    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)
@@ -192,6 +201,10 @@ class AdminData::Util
   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?

data/lib/admin_data/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: admin_data
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 61
   prerelease: false
   segments: 
   - 1
   - 0
-  - 19
-  version: 1.0.19
+  - 21
+  version: 1.0.21
 platform: ruby
 authors: 
 - Neeraj Singh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -05:00
+date: 2010-11-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,11 +113,13 @@ files:
 - app/controllers/admin_data/feed_controller.rb
 - app/controllers/admin_data/main_controller.rb
 - app/controllers/admin_data/migration_controller.rb
+- 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