admin_assistant 2.0.0.pre1 → 2.0.0.pre2

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/rdoctask'
 require 'spec/rake/spectask'
 
 desc 'Default: run all specs across all supported Rails gem versions.'
-task :default => :spec
+task :default => :test
 
 # run with rake publish
 Grancher::Task.new do |g|
@@ -25,8 +25,8 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
 end
 
 desc 'Run all specs across all supported Rails gem versions.'
-task :spec do
-  supported_versions = %w(2.1.0 2.1.2 2.2.2 2.3.2 2.3.3 2.3.4)
+task :test do
+  supported_versions = %w(3.0.6)
   locally_installed_versions =
       `gem list --local rails`.split(/\n/).
           detect { |l| l=~ /^rails / }.strip.
@@ -35,7 +35,7 @@ task :spec do
   if !missing.empty?
     puts "Missing Rails versions #{missing.join(',')}; please install and then re-run tests"
   else
-    cmd = "cd rails_2_test && " + (
+    cmd = "cd rails_3_test && " + (
       supported_versions.map { |version|
         "echo '===== Testing #{version} =====' && RAILS_GEM_VERSION=#{version} rake"
       }.join(" && ")
@@ -54,8 +54,10 @@ begin
     gem.email = "sera@fhwang.net"
     gem.homepage = "http://github.com/fhwang/admin_assistant"
     gem.authors = ["Francis Hwang"]
-    gem.add_dependency "will_paginate"
+    gem.add_dependency "will_paginate", "~> 3.0.pre2"
+    gem.add_dependency "dynamic_form"
     gem.files.exclude "rails_2_test"
+    gem.files.exclude "rails_3_test"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-2.0.0.pre1
+2.0.0.pre2

data/admin_assistant.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{admin_assistant}
-  s.version = "2.0.0.pre1"
+  s.version = "2.0.0.pre2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Hwang"]
@@ -21,9 +21,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "admin_assistant.gemspec",
+    "config/routes.rb",
     "doc/img/blog_posts-index.png",
-    "init.rb",
-    "install.rb",
     "lib/admin_assistant.rb",
     "lib/admin_assistant/active_record_column.rb",
     "lib/admin_assistant/association_target.rb",
@@ -32,11 +31,12 @@ Gem::Specification.new do |s|
     "lib/admin_assistant/column.rb",
     "lib/admin_assistant/date_time_range_end_point_selector.rb",
     "lib/admin_assistant/default_search_column.rb",
-    "lib/admin_assistant/file_column_column.rb",
     "lib/admin_assistant/form_view.rb",
     "lib/admin_assistant/has_many_column.rb",
     "lib/admin_assistant/helper.rb",
     "lib/admin_assistant/index.rb",
+    "lib/admin_assistant/init.rb",
+    "lib/admin_assistant/model.rb",
     "lib/admin_assistant/paperclip_column.rb",
     "lib/admin_assistant/polymorphic_belongs_to_column.rb",
     "lib/admin_assistant/request/autocomplete.rb",
@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
     "lib/admin_assistant/request/new.rb",
     "lib/admin_assistant/request/show.rb",
     "lib/admin_assistant/request/update.rb",
+    "lib/admin_assistant/route.rb",
     "lib/admin_assistant/search.rb",
     "lib/admin_assistant/show_view.rb",
     "lib/admin_assistant/virtual_column.rb",
@@ -144,12 +145,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<will_paginate>, [">= 0"])
+      s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
+      s.add_runtime_dependency(%q<dynamic_form>, [">= 0"])
     else
-      s.add_dependency(%q<will_paginate>, [">= 0"])
+      s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
+      s.add_dependency(%q<dynamic_form>, [">= 0"])
     end
   else
-    s.add_dependency(%q<will_paginate>, [">= 0"])
+    s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
+    s.add_dependency(%q<dynamic_form>, [">= 0"])
   end
 end
 

data/config/routes.rb

@@ -0,0 +1,16 @@
+# In development mode, we need to ensure that all controllers are loaded,
+# because that's how AdminAssistant knows what routes to create
+unless Rails.configuration.cache_classes
+  Find.find("#{Rails.root}/app/controllers") do |path|
+    if path =~ /\.rb$/
+      require path
+    end
+  end
+end
+
+Rails.application.routes.draw do
+  AdminAssistant.routes.each do |route|
+    route.add(binding)
+  end
+end
+

data/lib/admin_assistant/belongs_to_column.rb

@@ -136,7 +136,7 @@ class AdminAssistant
       end
       
       def errors(record)
-        record.errors.on @column.association_foreign_key
+        record.errors[@column.association_foreign_key]
       end
       
       def render_autocompleter(form)

data/lib/admin_assistant/column.rb

@@ -37,7 +37,9 @@ class AdminAssistant
         else
           helper_method = "after_#{name}_input"
           if @action_view.respond_to?(helper_method)
-            @action_view.send(helper_method, rails_form.object)
+            @action_view.raw(
+              @action_view.send(helper_method, rails_form.object)
+            )
           end
         end
       end
@@ -47,7 +49,7 @@ class AdminAssistant
       end
       
       def errors(record)
-        record.errors.on name
+        record.errors[name]
       end
 
       def html(rails_form)
@@ -218,7 +220,7 @@ class AdminAssistant
           opt << ">#{text}</option>"
         }.join("\n")
         @action_view.select_tag(
-          "search[#{name}(comparator)]", option_tags
+          "search[#{name}(comparator)]", @action_view.raw(option_tags)
         )
       end
       
@@ -338,15 +340,8 @@ class AdminAssistant
       end
       
       def check_box_and_hidden_tags(input_name, value)
-        # Rails 2.3 wants the hidden tag to come before the checkbox, but it's
-        # the opposite for Rails 2.2 and 2.1
-        if RAILS_GEM_VERSION =~ /^2.3/
-          @action_view.send(:hidden_field_tag, input_name, '0', :id => "#{input_name}_hidden") +
-              @action_view.send(:check_box_tag, input_name, '1', value)
-        else
-          @action_view.send(:check_box_tag, input_name, '1', value) +
-              @action_view.send(:hidden_field_tag, input_name, '0', :id => "#{input_name}_hidden")
-        end
+        @action_view.send(:hidden_field_tag, input_name, '0', :id => "#{input_name}_hidden") +
+            @action_view.send(:check_box_tag, input_name, '1', value)
       end
     
       def controller
@@ -355,17 +350,13 @@ class AdminAssistant
       
       def custom_template_file_path(slug)
         File.join(
-          RAILS_ROOT, 'app/views', controller.controller_path, 
+          Rails.root, 'app/views', controller.controller_path, 
           "#{slug}.html.erb"
         )
       end
       
       def file_option_for_custom_template_render(slug)
-        if RAILS_GEM_VERSION == '2.1.0'
-          File.join(controller.controller_path, "#{slug}.html.erb")
-        else
-          custom_template_file_path slug
-        end
+        custom_template_file_path slug
       end
       
       def label

data/lib/admin_assistant/date_time_range_end_point_selector.rb

@@ -2,8 +2,9 @@ class AdminAssistant
   # Copied (and then streamlined) from Rails 2.3.5 in an effort to provide 
   # consistent functionality all the way back to Rails 2.1.0
   class DateTimeRangeEndPointSelector
+    include ActionView::Helpers::RawOutputHelper
     include ActionView::Helpers::TagHelper
-
+  
     DEFAULT_PREFIX = 'date'.freeze unless const_defined?('DEFAULT_PREFIX')
     POSITION = {
       :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6
@@ -259,7 +260,7 @@ class AdminAssistant
         select_html << prompt_option_tag(type, @options[:prompt]) + "\n" if @options[:prompt]
         select_html << select_options_as_html.to_s
 
-        content_tag(:select, select_html, select_options) + "\n"
+        content_tag(:select, raw(select_html), select_options) + "\n"
       end
 
       # Builds a prompt option tag with supplied options or from default options

data/lib/admin_assistant/form_view.rb

@@ -43,8 +43,7 @@ class AdminAssistant
     
     def form_for_args
       args = {:url => {:action => action, :id => @record.id}}
-      unless @admin_assistant.paperclip_attachments.empty? &&
-             @admin_assistant.file_columns.empty?
+      if !@admin_assistant.paperclip_attachments.empty?
         args[:html] = {:multipart => true}
       end
       args
@@ -87,14 +86,13 @@ class AdminAssistant
     end
     
     def form_for_args
+      opts = {
+        :builder => AdminAssistant::MultiFormView::Builder,
+        :sub_form_views => @sub_form_views, :url => {:action => action}
+      }
       [
-        @records.first.class.name.underscore.to_sym,
-        @records,
-        {
-          :url => {:action => action},
-          :builder => AdminAssistant::MultiFormView::Builder,
-          :sub_form_views => @sub_form_views
-        }
+        RecordsForForm.new(@records),
+        opts.merge(:as => @records.first.class.name.underscore.to_sym)
       ]
     end
     
@@ -163,5 +161,16 @@ class AdminAssistant
         end
       end
     end
+    
+    # Passing an array as the object to form_for confuses it, so we hide that 
+    # this is an array with a DelegateClass.
+    class RecordsForForm < DelegateClass(Array)
+      def initialize(records)
+        super(records)
+      end
+      
+      def id
+      end
+    end
   end
 end

data/lib/admin_assistant/index.rb

@@ -193,12 +193,7 @@ class AdminAssistant
         slug = "_after_index_header.html.erb"
         abs_template_file = File.join( Rails.root, 'app/views', @admin_assistant.controller_class.controller_path, slug )
         if File.exist?(abs_template_file)
-          template = if RAILS_GEM_VERSION == '2.1.0'
-            File.join(@admin_assistant.controller_class.controller_path, slug)
-          else
-            abs_template_file
-          end
-          @action_view.render :file => template
+          @action_view.render :file => abs_template_file
         end
       end
       
@@ -260,7 +255,9 @@ class AdminAssistant
         else
           "New #{@admin_assistant.model_class_name}"
         end
-        @action_view.link_to new_link_name, @admin_assistant.url_params(:new)
+        @action_view.link_to(
+          new_link_name, @admin_assistant.url_params(:new)
+        )
       end
 
       def right_column?

data/lib/admin_assistant/init.rb

@@ -0,0 +1,14 @@
+require 'fileutils'
+require 'pathname'
+
+class AdminAssistant
+  def self.init
+    gem_root = File.dirname(__FILE__) + "/../.."
+    %w(stylesheets javascripts images).each do |asset_type|
+      asset_dir = "#{Rails.root}/public/#{asset_type}/admin_assistant"
+      FileUtils.mkdir(asset_dir) unless File.exist?(asset_dir)
+      FileUtils.cp_r(Dir.glob("#{gem_root}/lib/#{asset_type}/*"), asset_dir)
+    end
+  end
+end
+

data/lib/admin_assistant/model.rb

@@ -0,0 +1,72 @@
+class AdminAssistant
+  class Model
+    def initialize(ar_model)
+      @ar_model = ar_model
+    end
+    
+    def accessors
+      @ar_model.instance_methods.
+          select { |m| m =~ /=$/ }.
+          map { |m| m.gsub(/=/, '')}.
+          select { |m| @ar_model.instance_methods.include?(m) }
+    end
+  
+    def belongs_to_associations
+      @ar_model.reflect_on_all_associations.select { |assoc|
+        assoc.macro == :belongs_to
+      }
+    end
+    
+    def belongs_to_assoc(association_name)
+      belongs_to_associations.detect { |assoc|
+        assoc.name.to_s == association_name.to_s
+      }
+    end
+    
+    def belongs_to_assoc_by_foreign_key(foreign_key)
+      belongs_to_associations.detect { |assoc|
+        assoc.association_foreign_key == foreign_key
+      }
+    end
+    
+    def belongs_to_assoc_by_polymorphic_type(name)
+      if name =~ /^(.*)_type/
+        belongs_to_associations.detect { |assoc|
+          assoc.options[:polymorphic] && $1 == assoc.name.to_s
+        }
+      end
+    end
+    
+    def default_column_names
+      @ar_model.columns.reject { |ar_column|
+        %w(id created_at updated_at).include?(ar_column.name)
+      }.map { |ar_column| ar_column.name }
+    end
+  
+    def has_many_assoc(association_name)
+      @ar_model.reflect_on_all_associations.select { |assoc|
+        assoc.macro == :has_many
+      }.detect { |assoc|
+        assoc.name.to_s == association_name.to_s
+      }
+    end
+    
+    def paperclip_attachments
+      pa = []
+      if @ar_model.respond_to?(:attachment_definitions)
+        if @ar_model.attachment_definitions
+          pa = @ar_model.attachment_definitions.map { |name, definition|
+            name
+          }
+        end
+      end
+      pa
+    end
+  
+    def searchable_columns
+      @ar_model.columns.select { |column|
+        [:string, :text].include?(column.type)
+      }
+    end
+  end
+end

data/lib/admin_assistant/request/base.rb

@@ -24,14 +24,14 @@ class AdminAssistant
       
       def after_template_file(template_name)
         File.join(
-          RAILS_ROOT, 'app/views/', @controller.controller_path, 
+          Rails.root, 'app/views/', @controller.controller_path, 
           "_after_#{template_name}.html.erb"
         )
       end
       
       def before_template_file(template_name)
         File.join(
-          RAILS_ROOT, 'app/views/', @controller.controller_path, 
+          Rails.root, 'app/views/', @controller.controller_path, 
           "_before_#{template_name}.html.erb"
         )
       end

data/lib/admin_assistant/route.rb

@@ -0,0 +1,50 @@
+class AdminAssistant
+  class Route
+    attr_reader :admin_assistant
+    
+    def initialize(admin_assistant)
+      @admin_assistant = admin_assistant
+    end
+    
+    def add(binding)
+      route_str = "resources(:#{resource})"
+      unless autocomplete_actions.empty?
+        route_str << " do "
+        autocomplete_actions.each do |action|
+          route_str << " get :#{action}, :on => :collection;"
+        end
+        route_str << " end "
+      end
+      if namespace
+        route_str = "namespace(:#{namespace}) do " + route_str + " end"
+      end
+      eval(route_str, binding)
+    end
+    
+    def autocomplete_actions
+      admin_assistant.autocomplete_actions
+    end
+    
+    def controller
+      admin_assistant.controller_class
+    end
+    
+    def namespace
+      name = controller.name.gsub(/Controller$/, '').underscore
+      if name =~ %r|(.*)/(.*)|
+        $1.to_sym
+      end
+    end
+    
+    def resource
+      name = controller.name.gsub(/Controller$/, '').underscore
+      if name =~ %r|(.*)/(.*)|
+        $2.to_sym
+      else
+        name.to_sym
+      end
+    end
+  end
+end
+
+

data/lib/admin_assistant/virtual_column.rb

@@ -51,14 +51,14 @@ class AdminAssistant
           @action_view.send("#{input}_tag", input_name, string(object))
         end
         if has_matching_errors?(object)
-          html = "<div class=\"fieldWithErrors\">#{html}</div>"
+          html = "<div class=\"field_with_errors\">#{html}</div>"
         end
         html
       end
       
       def has_matching_errors?(record)
-        record.respond_to?(:errors) && record.errors.respond_to?(:on) && 
-           record.errors.on(name)
+        record.respond_to?(:errors) && record.errors.respond_to?(:[]) && 
+           record.errors[name]
       end
     end
     

data/lib/admin_assistant.rb

@@ -1,17 +1,24 @@
 $: << File.join(File.dirname(__FILE__), '../vendor/ar_query/lib')
+require 'dynamic_form'
+require 'will_paginate'
+
 require 'find'
-require 'admin_assistant/column'
-Find.find(File.dirname(__FILE__)) do |path|
-  if path =~ %r|\.rb$| && path !~ %r|admin_assistant\.rb$| &&
-     path !~ %r|admin_assistant/column\.rb$|
-    require path
-  end
+files = %w(
+  column virtual_column active_record_column association_target
+  belongs_to_column builder date_time_range_end_point_selector 
+  default_search_column form_view has_many_column helper index init model 
+  paperclip_column polymorphic_belongs_to_column request/base 
+  request/autocomplete request/create request/destroy request/edit
+  request/index request/new request/show request/update route search show_view
+)
+files.each do |file|
+  require "#{File.dirname(__FILE__)}/admin_assistant/#{file}"
 end
-require 'will_paginate'
 
 class AdminAssistant
-  cattr_accessor :request_start_time
-
+  cattr_accessor :request_start_time, :routes
+  self.routes = []
+  
   def self.profile(msg)
     if self.request_start_time
       Rails.logger.info "#{msg}: #{Time.now - self.request_start_time}"
@@ -81,9 +88,7 @@ class AdminAssistant
   end
   
   def column(name)
-    if @model.file_columns.include?(name.to_s)
-      FileColumnColumn.new name
-    elsif @model.paperclip_attachments.include?(name)
+    if @model.paperclip_attachments.include?(name)
       PaperclipColumn.new name
     elsif (belongs_to_assoc = @model.belongs_to_assoc(name) or
            belongs_to_assoc = @model.belongs_to_assoc_by_foreign_key(name))
@@ -136,10 +141,6 @@ class AdminAssistant
     @model.default_column_names
   end
   
-  def file_columns
-    @model.file_columns
-  end
-  
   def method_missing(meth, *args)
     if crudful_request_methods.include?(meth) and args.size == 1
       self.class.request_start_time = Time.now if ENV['PROFILE_LOGGING']
@@ -200,98 +201,19 @@ class AdminAssistant
             self.class.admin_assistant.send(action, self)
           end
         end
+        AdminAssistant.routes << Route.new(self.admin_assistant)
       rescue ActiveRecord::StatementInvalid
         Rails.logger.info "Skipping admin_assistant_for for #{self.name} because the table doesn't exist in the DB. Hopefully that's because you're deploying with a migration."
       end
     end
   end
-  
-  class Model
-    def initialize(ar_model)
-      @ar_model = ar_model
-    end
-    
-    def accessors
-      @ar_model.instance_methods.
-          select { |m| m =~ /=$/ }.
-          map { |m| m.gsub(/=/, '')}.
-          select { |m| @ar_model.instance_methods.include?(m) }
-    end
-  
-    def belongs_to_associations
-      @ar_model.reflect_on_all_associations.select { |assoc|
-        assoc.macro == :belongs_to
-      }
-    end
-    
-    def belongs_to_assoc(association_name)
-      belongs_to_associations.detect { |assoc|
-        assoc.name.to_s == association_name.to_s
-      }
-    end
-    
-    def belongs_to_assoc_by_foreign_key(foreign_key)
-      belongs_to_associations.detect { |assoc|
-        assoc.association_foreign_key == foreign_key
-      }
-    end
-    
-    def belongs_to_assoc_by_polymorphic_type(name)
-      if name =~ /^(.*)_type/
-        belongs_to_associations.detect { |assoc|
-          assoc.options[:polymorphic] && $1 == assoc.name.to_s
-        }
-      end
-    end
-    
-    def default_column_names
-      @ar_model.columns.reject { |ar_column|
-        %w(id created_at updated_at).include?(ar_column.name)
-      }.map { |ar_column| ar_column.name }
-    end
-  
-    def file_columns
-      unless @file_columns
-        @file_columns = []
-        if @ar_model.respond_to?(:file_column)
-          names_to_check = @ar_model.columns.map(&:name).concat(accessors).uniq
-          @file_columns = names_to_check.select { |name|
-            %w( relative_path dir relative_dir temp ).all? { |suffix|
-              @ar_model.method_defined? "#{name}_#{suffix}".to_sym
-            }
-          }
-        end
-      end
-      @file_columns
-    end
-    
-    def has_many_assoc(association_name)
-      @ar_model.reflect_on_all_associations.select { |assoc|
-        assoc.macro == :has_many
-      }.detect { |assoc|
-        assoc.name.to_s == association_name.to_s
-      }
-    end
-    
-    def paperclip_attachments
-      pa = []
-      if @ar_model.respond_to?(:attachment_definitions)
-        if @ar_model.attachment_definitions
-          pa = @ar_model.attachment_definitions.map { |name, definition|
-            name
-          }
-        end
-      end
-      pa
-    end
-  
-    def searchable_columns
-      @ar_model.columns.select { |column|
-        [:string, :text].include?(column.type)
-      }
+
+  class Engine < ::Rails::Engine
+    initializer "admin_assistant.init" do
+      AdminAssistant.init
     end
   end
 end
-
+  
 ActionController::Base.send :include, AdminAssistant::ControllerMethods
 

data/lib/stylesheets/default.css

@@ -104,7 +104,7 @@ Don't edit this file: It gets re-copied every time the server starts.
   font-size: small;
 }
 
-.admin_assistant.form .fieldWithErrors {
+.admin_assistant.form .field_with_errors {
   background: red;
 }
 

data/lib/views/_polymorphic_field_search.html.erb

@@ -49,12 +49,12 @@ end
       <%
         option_tags = "<option value=''></option>"
         option_tags << options_for_select(
-          association_target.options_for_select,
-          (associated.id if associated.class == polymorphic_type)
+            association_target.options_for_select,
+            (associated.id if associated.class == polymorphic_type)
         )
       %>
       <%= select_tag(
-        "#{column.name}_#{name}_id", option_tags,
+        "#{column.name}_#{name}_id", raw(option_tags),
         'data-behavior' => 'select',
         'data-value-type' => polymorphic_type.name
       ) %> 

data/lib/views/_token_input.html.erb

@@ -19,7 +19,7 @@ end
 <script type="text/javascript">
 $(document).ready(function() {
   $("#<%= text_field_id %>").tokenInput(
-    "<%= token_url %>", <%= token_input_options.to_json %>
+    "<%= raw(token_url) %>", <%= raw(token_input_options.to_json) %>
   );
 });
 </script>

data/lib/views/form.html.erb

@@ -14,7 +14,7 @@ form_view = AdminAssistant::FormView.new(@record, @admin_assistant, self)
   <% if !@record.errors.empty? %>
     <%= error_messages_for 'record' %>
   <% end %>
-  <% form_for(@record, form_view.form_for_args) do |rails_form| %>
+  <%= form_for(@record, form_view.form_for_args) do |rails_form| %>
     <% if @origin %>
       <%= hidden_field_tag 'origin', @origin %>
     <% end %>
@@ -25,7 +25,7 @@ form_view = AdminAssistant::FormView.new(@record, @admin_assistant, self)
       <% if column.description %>
         <p class="description"><%= h(column.description) %></p>
       <% end %>
-      <%= column.html(rails_form) %>
+      <%= raw(column.html(rails_form)) %>
       </div>
     <% end %>
       <div>

data/lib/views/index.html.erb

@@ -18,9 +18,9 @@
 <%= index_view.render_after_index_header %>
 </div>
 
-<% form_for(
-  :search, @index.search,
-  :url => {:action => 'index'},
+<%= form_for(
+  @index.search,
+  :as => :search, :url => {:action => 'index'},
   :html => {:id => 'search_form', :style => 'display:none', :method => 'get'}
 ) do |form| %>
   <% @index.hidden_fields_for_search_form.each do |name, value| -%>
@@ -37,7 +37,7 @@
     ) %>
   <% end %>
   <% column_views.each do |column_view| %>
-    <%= column_view.html(form) %>
+    <%= raw(column_view.html(form)) %>
   <% end %>
   <%= submit_tag('Search') %>
   <%=
@@ -59,7 +59,7 @@
     <tr>
     <% index_view.columns.each do |column| %>
       <% th_class = column.header_css_class %>
-      <th<%= " class=\"#{th_class}\"" if th_class %>><%=
+      <th<%= raw(" class=\"#{th_class}\"") if th_class %>><%=
         if column.sort_possible?(@index.records.total_entries)
           link_to(h(column.label), column.next_sort_params)
         else
@@ -77,12 +77,14 @@
     %>_<%= record.id %>">
       <% index_view.columns.each do |column| %>
         <% td_class = column.td_css_classes(column, record) %>
-        <td<%= " class=\"#{td_class}\"" unless td_class.blank? %>><%=
-          column.html(record)
+        <td<%= raw(" class=\"#{td_class}\"") unless td_class.blank? %>><%=
+          raw(column.html(record))
         %></td>
       <% end %>
       <% if index_view.right_column? %>
-      <td class="actions"><%= index_view.right_column_links(record) %></td>
+      <td class="actions">
+        <%= raw(index_view.right_column_links(record)) %>
+      </td>
       <% end %>
     </tr>
   <% end %>
@@ -95,7 +97,7 @@
     <%= will_paginate @index.records, :container => false %>
   </div>
 <% if @index.records.total_pages > 10 %>
-  <% form_tag({:action => 'index'}, :method => 'get') do %>
+  <%= form_tag({:action => 'index'}, :method => 'get') do %>
     <%= text_field_tag('page', nil, :size => 2) %>
     <%= submit_tag('Jump') %>
   <% end %>

data/lib/views/multi_form.html.erb

@@ -12,7 +12,7 @@ multi_form_view = AdminAssistant::MultiFormView.new(
     <%= link_to('Back to index', :action => 'index') %>
     </div>
   </div>
-  <% form_for(*multi_form_view.form_for_args) do |rails_form| %>
+  <%= form_for(*multi_form_view.form_for_args) do |rails_form| %>
     <% if @origin %>
       <%= hidden_field_tag 'origin', @origin %>
     <% end %>
@@ -53,7 +53,7 @@ multi_form_view = AdminAssistant::MultiFormView.new(
         <% end %>
         <tr>
         <% sub_form_view.columns.each do |column| %>
-          <td<%= " class='fieldWithErrors'" if column.errors(record) %>>
+          <td<%= " class='field_with_errors'" if column.errors(record) %>>
             <%= column.html(rails_sub_form) %>
           </td>
         <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: admin_assistant
 version: !ruby/object:Gem::Version 
-  hash: -1876988224
+  hash: -1876988223
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - pre1
-  version: 2.0.0.pre1
+  - pre2
+  version: 2.0.0.pre2
 platform: ruby
 authors: 
 - Francis Hwang
@@ -23,6 +23,22 @@ dependencies:
   name: will_paginate
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: -1876988247
+        segments: 
+        - 3
+        - 0
+        - pre2
+        version: 3.0.pre2
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: dynamic_form
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,7 +48,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 description: admin_assistant is a Rails plugin that automates a lot of features typically needed in admin interfaces.
 email: sera@fhwang.net
 executables: []
@@ -47,9 +63,8 @@ files:
 - Rakefile
 - VERSION
 - admin_assistant.gemspec
+- config/routes.rb
 - doc/img/blog_posts-index.png
-- init.rb
-- install.rb
 - lib/admin_assistant.rb
 - lib/admin_assistant/active_record_column.rb
 - lib/admin_assistant/association_target.rb
@@ -58,11 +73,12 @@ files:
 - lib/admin_assistant/column.rb
 - lib/admin_assistant/date_time_range_end_point_selector.rb
 - lib/admin_assistant/default_search_column.rb
-- lib/admin_assistant/file_column_column.rb
 - lib/admin_assistant/form_view.rb
 - lib/admin_assistant/has_many_column.rb
 - lib/admin_assistant/helper.rb
 - lib/admin_assistant/index.rb
+- lib/admin_assistant/init.rb
+- lib/admin_assistant/model.rb
 - lib/admin_assistant/paperclip_column.rb
 - lib/admin_assistant/polymorphic_belongs_to_column.rb
 - lib/admin_assistant/request/autocomplete.rb
@@ -74,6 +90,7 @@ files:
 - lib/admin_assistant/request/new.rb
 - lib/admin_assistant/request/show.rb
 - lib/admin_assistant/request/update.rb
+- lib/admin_assistant/route.rb
 - lib/admin_assistant/search.rb
 - lib/admin_assistant/show_view.rb
 - lib/admin_assistant/virtual_column.rb

data/init.rb

@@ -1 +0,0 @@
-require "#{File.dirname(__FILE__)}/lib/admin_assistant"

data/install.rb

@@ -1,21 +0,0 @@
-require 'fileutils'
-require 'pathname'
-
-outer = File.dirname(__FILE__)
-
-# Delete rails_2_test and various doc directories, unless you're actually
-# developing admin_assistant itself
-test_rails_app = Pathname.new("#{outer}/rails_2_test").realpath.to_s
-unless RAILS_ROOT == test_rails_app
-  %w(doc rails_2_test website).each do |dir|
-    FileUtils.rm_rf "#{outer}/#{dir}"
-  end
-end
-
-# Copy over static assets
-%w(stylesheets javascripts images).each do |asset_type|
-  asset_dir = "#{Rails.root}/public/#{asset_type}/admin_assistant"
-  FileUtils.mkdir(asset_dir) unless File.exist?(asset_dir)
-  FileUtils.cp_r(Dir.glob("#{outer}/lib/#{asset_type}/*"), asset_dir)
-end
-

data/lib/admin_assistant/file_column_column.rb

@@ -1,73 +0,0 @@
-class AdminAssistant
-  class FileColumnColumn < Column
-    attr_reader :name
-    
-    def initialize(name)
-      @name = name.to_s
-    end
-    
-    def contains?(column_name)
-      column_name.to_s == @name
-    end
-
-    class View < AdminAssistant::Column::View
-      def file_exists?(record)
-        if @file_exists_method
-          @file_exists_method.call record
-        else
-          !source_for_image_tag(record).nil?
-        end
-      end
-      
-      def image_html(record)
-        @action_view.image_tag(
-          source_for_image_tag(record), :size => @image_size
-        )
-      end
-      
-      def source_for_image_tag(record)
-        if @file_url_method
-          @file_url_method.call record
-        else
-          @action_view.instance_variable_set :@record, record
-          @action_view.url_for_file_column 'record', @column.name
-        end
-      end
-    end
-    
-    class FormView < View
-      include AdminAssistant::Column::FormViewMethods
-      
-      def default_html(form)
-        if file_exists?(form.object)
-          check_box_tag = @action_view.check_box_tag(
-            "#{form.object.class.name.underscore}[#{name}(destroy)]"
-          )
-          <<-HTML
-          <p>Current image:<br />#{image_html(form.object)}</p>
-          <p>Remove: #{check_box_tag}</p>
-          <p>Update: #{form.file_field(name)}</p>
-          HTML
-        else
-          "<p>Add: #{form.file_field(name)}</p>"
-        end
-      end
-    end
-
-    class IndexView < View
-      include AdminAssistant::Column::IndexViewMethods
-      
-      def unconfigured_html(record)
-        image_html(record) if file_exists?(record)
-      end
-    end
-    
-    class ShowView < View
-      include AdminAssistant::Column::ShowViewMethods
-      
-      def html(record)
-        image_html(record) if file_exists?(record)
-      end
-    end
-  end
-end