typus 3.1.0.rc19 → 3.1.0

data/CHANGELOG

@@ -1,38 +1,7 @@
 = 3.2.0 (unreleased)
 
- * [PLANNED] Models without a controller defined should use the "Resources"
-   controller.
-
- * [PLANNED] New theme and theme support.
-
 = 3.1.0 (unreleased)
 
- * [PLANNED] Block changing uploaded files.
-
- * [PLANNED] Use roles when using `:none` authentication.
-
- * [PLANNED] Fix bulk actions combo separator. (UI)
-
- * [PLANNED] Remove "Versions" stuff from demo sidebar.
-
- * [PLANNED] Fix selector UI problems.
-
- * [PLANNED] Reload data on forms only if data has changed. (UI)
-
- * [PLANNED] Take back "Add New" on "BelongsTo" associations.
-
- * [PLANNED] Document: `text_with_ckeditor_with_assets`.
-
- * [PLANNED] Document: Migrate from `3.0` to `3.1`.
-
- * [PLANNED] Document: How to test an admin controller?
-
- * [PLANNED] Namespace filters to avoid collision with model attributes.
-
- * [PLANNED] Helpers for `display_dragonfly` and `display_paperclip`.
-
- * [NEW] Mountable apps support!
-
  * [NEW] Filter with scopes.
 
  * [NEW] Three different actions to save a record.
@@ -106,6 +75,12 @@
  
  * [CHANGED] Custom actions are back!
 
+ * [REMOVED] Read Only option has been removed from configuration files. This
+   wasn't really protecting the forms. We are now using `attr_protected` with
+   roles: `attr_protected :title, :as => :admin`.
+
+ * [CHANGED] Configuration files are now generated by model not by groups.
+
 = 3.0.12
 
  * [FIXED] Use will_paginate 3.0.0.

data/Gemfile

@@ -64,6 +64,6 @@ end
 # make sense to have this here.
 group :development do
   gem "guard-livereload"
-  gem "rb-fsevent"
-  gem "growl_notify"
+  # gem "rb-fsevent"
+  # gem "growl_notify"
 end

data/app/assets/javascripts/typus/jquery.application.js

@@ -11,7 +11,7 @@ $(document).ready(function() {
         'scrolling': false,
     });
 
-    $(".iframe_with_reload").fancybox({
+    $(".iframe_with_form_reload").fancybox({
         'width': 720,
         'height': '90%',
         'autoScale': false,
@@ -20,7 +20,14 @@ $(document).ready(function() {
         'type': 'iframe',
         'centerOnScroll': true,
         'scrolling': false,
-        onClosed: function() { parent.location.reload(true); },
+        onClosed: function() {
+            // console.log(arguments);
+            var attribute = Typus.resource_attribute;
+            var text = Typus.resource_to_label;
+            var value = Typus.resource_id;
+            $(attribute).append(new Option(text, value, true, true));
+            $(".chzn-select").trigger("liszt:updated");
+        },
     });
 
     $(".iframe").fancybox({
@@ -32,6 +39,10 @@ $(document).ready(function() {
         'type': 'iframe',
         'centerOnScroll': true,
         'scrolling': false,
+        onClosed: function() {
+            if (Typus.parent_location_reload)
+                parent.location.reload(true);
+        },
     });
 
     // This method is used by Typus::Controller::Bulk
@@ -45,6 +56,8 @@ $(document).ready(function() {
 
 });
 
+Typus = {}
+
 function setConfirmUnload(on) {
     window.onbeforeunload = (on) ? unloadMessage : null;
 }

data/app/controllers/admin/account_controller.rb

@@ -18,8 +18,7 @@ class Admin::AccountController < Admin::BaseController
     redirect_to user ? { :action => "show", :id => user.token } : { :action => :new }
   end
 
-  def forgot_password
-  end
+  def forgot_password; end
 
   def send_password
     if user = Typus.user_class.find_by_email(params[:typus_user][:email])

data/app/controllers/admin/base_controller.rb

@@ -7,6 +7,7 @@ class Admin::BaseController < ActionController::Base
   before_filter :set_locale
 
   helper_method :admin_user
+  helper_method :current_role
 
   def user_guide; end
 
@@ -18,10 +19,10 @@ class Admin::BaseController < ActionController::Base
 
   def set_locale
     I18n.locale = if admin_user && admin_user.respond_to?(:locale)
-                    admin_user.locale
-                  else
-                    Typus::I18n.default_locale
-                  end
+      admin_user.locale
+    else
+      Typus::I18n.default_locale
+    end
   end
 
   def zero_users

data/app/controllers/admin/resources_controller.rb

@@ -22,12 +22,8 @@ class Admin::ResourcesController < Admin::BaseController
 
     respond_to do |format|
       format.html do
-        if headless_mode_with_custom_action_is_enabled?
-          set_headless_resource_actions
-        else
-          set_default_action
-          add_resource_action("Trash", {:action => "destroy"}, {:confirm => "#{Typus::I18n.t("Trash")}?", :method => 'delete'})
-        end
+        set_default_action
+        add_resource_action("Trash", {:action => "destroy"}, {:confirm => "#{Typus::I18n.t("Trash")}?", :method => 'delete'})
         generate_html
       end
 
@@ -36,9 +32,7 @@ class Admin::ResourcesController < Admin::BaseController
   end
 
   def new
-    item_params = params.dup
-    item_params.delete_if { |k, v| !@resource.columns.map(&:name).include?(k) }
-    @item = @resource.new(item_params)
+    @item = @resource.new(params[:resource])
 
     respond_to do |format|
       format.html # new.html.erb
@@ -47,8 +41,13 @@ class Admin::ResourcesController < Admin::BaseController
   end
 
   def create
+    # Note that we still can still assign the item to another model. To change
+    # this behavior we need only to change how we merge the params.
+    item_params = params[:resource] || {}
+    item_params.merge!(params[@object_name])
+
     @item = @resource.new
-    @item.assign_attributes(params[@object_name], :as => :admin)
+    @item.assign_attributes(item_params, :as => current_role)
 
     set_attributes_on_create
 
@@ -84,11 +83,10 @@ class Admin::ResourcesController < Admin::BaseController
   end
 
   def update
-    attributes = params[:attribute] ? { params[:attribute] => nil } : params[@object_name]
+    attributes = params[:_nullify] ? { params[:_nullify] => nil } : params[@object_name]
 
     respond_to do |format|
-      role = admin_user.is_root? ? :admin : :default
-      if @item.update_attributes(attributes, :as => role)
+      if @item.update_attributes(attributes, :as => current_role)
         set_attributes_on_update
         format.html { redirect_on_success }
         format.json { render :json => @item }
@@ -200,18 +198,18 @@ class Admin::ResourcesController < Admin::BaseController
   def redirect_on_success
     path = params.dup.cleanup
 
-    if params[:_save]
-      path.delete_if { |k, v| %w(action id).include?(k) } # Redirects to { :action => 'index' }
+    options = if params[:_save]
+      { :action => nil, :id => nil }
     elsif params[:_addanother]
-      path.merge!(:action => 'new', :id => nil) # Redirects to { :action => 'new' }
+      { :action => 'new', :id => nil }
     elsif params[:_continue]
-      path.merge!(:action => 'edit', :id => @item.id) # Redirects to { :action => 'edit' => :id => @item.id }
+      { :action => 'edit', :id => @item.id }
     end
 
     message = params[:action].eql?('create') ? "%{model} successfully created." : "%{model} successfully updated."
     notice = Typus::I18n.t(message, :model => @resource.model_name.human)
 
-    redirect_to path, :notice => notice
+    redirect_to path.merge!(options).compact, :notice => notice
   end
 
   def set_default_action

data/app/controllers/admin/session_controller.rb

@@ -11,11 +11,11 @@ class Admin::SessionController < Admin::BaseController
     user = user_scope.authenticate(params[:typus_user][:email], params[:typus_user][:password])
 
     path = if user
-             session[:typus_user_id] = user.id
-             params[:back_to] || admin_dashboard_index_path
-           else
-             new_admin_session_path(:back_to => params[:back_to])
-           end
+      session[:typus_user_id] = user.id
+      params[:back_to] || admin_dashboard_index_path
+    else
+      new_admin_session_path(:back_to => params[:back_to])
+    end
 
     redirect_to path
   end

data/app/helpers/admin/resources/data_types/belongs_to_helper.rb

@@ -4,29 +4,28 @@ module Admin::Resources::DataTypes::BelongsToHelper
     association = @resource.reflect_on_association(attribute.to_sym)
 
     related = if defined?(set_belongs_to_context)
-                set_belongs_to_context.send(attribute.pluralize.to_sym)
-              else
-                association.class_name.constantize
-              end
-    related_fk = association.foreign_key
+      set_belongs_to_context.send(attribute.pluralize.to_sym)
+    else
+      association.class_name.constantize
+    end
 
+    related_fk = association.foreign_key
     html_options = { :disabled => attribute_disabled?(attribute) }
     label_text = @resource.human_attribute_name(attribute)
+    options = { :attribute => "#{@resource.name.downcase}_#{related_fk}" }
 
     label_text = @resource.human_attribute_name(attribute)
-    if (text = build_label_text_for_belongs_to(related, html_options))
+    if (text = build_label_text_for_belongs_to(related, html_options, options))
       label_text += "<small>#{text}</small>"
     end
 
     values = if related.respond_to?(:roots)
-               expand_tree_into_select_field(related.roots, related_fk)
-             else
-               related.order(related.typus_order_by).map { |p| [p.to_label, p.id] }
-             end
+      expand_tree_into_select_field(related.roots, related_fk)
+    else
+      related.order(related.typus_order_by).map { |p| [p.to_label, p.id] }
+    end
 
     render "admin/templates/belongs_to",
-           :association => association,
-           :resource => @resource,
            :attribute => attribute,
            :attribute_id => "#{@resource.table_name}_#{attribute}",
            :form => form,
@@ -66,23 +65,20 @@ module Admin::Resources::DataTypes::BelongsToHelper
     items += resource.order(resource.typus_order_by).map { |v| [v.to_label, v.id] }
   end
 
-  def build_label_text_for_belongs_to(klass, html_options)
+  def build_label_text_for_belongs_to(klass, html_options, options)
     if html_options[:disabled] == true
       Typus::I18n.t("Read only")
     elsif admin_user.can?('create', klass) && !headless_mode?
-      build_add_new_for_belongs_to(klass)
+      build_add_new_for_belongs_to(klass, options)
     end
   end
 
-  def build_add_new_for_belongs_to(klass)
-    options = { :controller => "/admin/#{klass.to_resource}",
-                :action => 'new',
-                :resource => @resource.model_name,
-                :layout => 'admin/headless' }
-    # Pass the resource_id only to edit/update because only there is where
-    # the record actually exists.
-    options.merge!(:resource_id => @item.id) if %w(edit update).include?(params[:action])
-    link_to Typus::I18n.t("Add New"), options, { :class => 'iframe' }
+  def build_add_new_for_belongs_to(klass, options)
+    default_options = { :controller => "/admin/#{klass.to_resource}",
+                        :action => 'new',
+                        :attribute => options[:attribute],
+                        :_popup => true }
+    link_to Typus::I18n.t("Add New"), default_options, { :class => 'iframe_with_form_reload' }
   end
 
 end

data/app/helpers/admin/resources/data_types/dragonfly_helper.rb

@@ -12,7 +12,7 @@ module Admin::Resources::DataTypes::DragonflyHelper
       attribute_i18n = @item.class.human_attribute_name(attribute)
       label_text = <<-HTML
 #{attribute_i18n}
-<small>#{link_to Typus::I18n.t("Remove"), { :action => 'update', :id => @item.id, :attribute => attribute, :_continue => true }, :confirm => Typus::I18n.t("Are you sure?")}</small>
+<small>#{link_to Typus::I18n.t("Remove"), { :action => 'update', :id => @item.id, :_nullify => attribute, :_continue => true }, :confirm => Typus::I18n.t("Are you sure?")}</small>
       HTML
       label_text.html_safe
     end

data/app/helpers/admin/resources/data_types/has_and_belongs_to_many_helper.rb

@@ -12,8 +12,10 @@ module Admin::Resources::DataTypes::HasAndBelongsToManyHelper
 
     html_options = { :disabled => attribute_disabled?(resource_ids.to_sym) }
 
+    options = { :attribute => "#{@resource.name.downcase}_#{attribute}" }
+
     label_text = @resource.human_attribute_name(attribute)
-    if (text = build_label_text_for_has_and_belongs_to_many(klass, html_options))
+    if (text = build_label_text_for_has_and_belongs_to_many(klass, html_options, options))
       label_text += "<small>#{text}</small>"
     end
 
@@ -30,27 +32,21 @@ module Admin::Resources::DataTypes::HasAndBelongsToManyHelper
     render "admin/templates/has_and_belongs_to_many", locals
   end
 
-  def build_label_text_for_has_and_belongs_to_many(klass, html_options)
+  def build_label_text_for_has_and_belongs_to_many(klass, html_options, options)
     if html_options[:disabled] == true
       Typus::I18n.t("Read only")
-=begin
-    # TODO: Take this back at some point in the future. Adding a new item
-    #       using the pop-up should update the items on the selector. I know
-    #       this might be the most trivial thing in the world, but I don't
-    #       know how to do it.
     elsif admin_user.can?('create', klass) && !headless_mode?
-      build_add_new_for_has_and_belongs_to_many(klass)
-=end
+      build_add_new_for_has_and_belongs_to_many(klass, options)
     end
   end
 
-  def build_add_new_for_has_and_belongs_to_many(klass)
+  def build_add_new_for_has_and_belongs_to_many(klass, options)
     options = { :controller => "/admin/#{klass.to_resource}",
                 :action => "new",
-                :layout => "admin/headless",
-                :return_to => request.path }
+                :attribute => options[:attribute],
+                :_popup => true }
 
-    link_to Typus::I18n.t("Add New"), options, { :class => "iframe" }
+    link_to Typus::I18n.t("Add New"), options, { :class => "iframe_with_form_reload" }
   end
 
 end

data/app/helpers/admin/resources/data_types/has_many_helper.rb

@@ -14,15 +14,13 @@ module Admin::Resources::DataTypes::HasManyHelper
   def typus_form_has_many(field)
     setup_relationship(field)
 
-    options = { @reflection.foreign_key => @item.id }
+    options = { "resource[#{@reflection.foreign_key}]" => @item.id }
 
     if @reflection.options && (as = @reflection.options[:as])
       klass = @resource.is_sti? ? @resource.superclass : @resource
       options.merge!("#{as}_type" => klass)
     end
 
-    count_items_to_relate = @model_to_relate.order(@model_to_relate.typus_order_by).count - @item.send(field).count
-
     build_pagination
     set_has_many_resource_actions
 
@@ -37,14 +35,14 @@ module Admin::Resources::DataTypes::HasManyHelper
     if admin_user.can?("create", klass)
       default_options = { :controller => "/admin/#{klass.to_resource}",
                           :action => "new",
-                          :layout => "admin/headless" }
+                          :_popup => true }
 
-      link_to Typus::I18n.t("Add New"), default_options.merge(options), { :class => "iframe_with_reload" }
+      link_to Typus::I18n.t("Add New"), default_options.merge(options), { :class => "iframe" }
     end
   end
 
   def set_has_many_resource_actions
-    @resource_actions = [["Edit", { :action => "edit", :layout => 'admin/headless' }, { :class => 'iframe' }],
+    @resource_actions = [["Edit", { :action => "edit", :_popup => true }, { :class => 'iframe' }],
                          ["Trash", { :action => "destroy" }, { :confirm => "Trash?" } ]]
   end
 

data/app/helpers/admin/resources/data_types/has_one_helper.rb

@@ -11,7 +11,7 @@ module Admin::Resources::DataTypes::HasOneHelper
     locals = { :association_name => @association_name, :table => build_relationship_table, :add_new => nil }
 
     if @items.empty?
-      options = { :resource_id => nil, @reflection.foreign_key => @item.id }
+      options = { "resource[#{@reflection.foreign_key}]" => @item.id }
       locals[:add_new] = build_add_new_for_has_one(@model_to_relate, field, options)
     end
 
@@ -22,7 +22,7 @@ module Admin::Resources::DataTypes::HasOneHelper
     if admin_user.can?("create", klass)
       default_options = { :controller => "/admin/#{klass.to_resource}",
                           :action => "new",
-                          :layout => "admin/headless" }
+                          :_popup => true }
 
       link_to Typus::I18n.t("Add New"), default_options.merge(options), { :class => "iframe" }
     end

data/app/helpers/admin/resources/form_helper.rb

@@ -33,11 +33,9 @@ module Admin::Resources::FormHelper
 
     label_text = @resource.human_attribute_name(attribute)
 
-=begin
     if options[:disabled] == true
       label_text += "<small>#{Typus::I18n.t("Read only")}</small>"
     end
-=end
 
     locals = { :resource => @resource,
                :attribute => attribute,
@@ -52,8 +50,7 @@ module Admin::Resources::FormHelper
 
   def attribute_disabled?(attribute)
     if protected_attributes = @resource._protected_attributes
-      role = admin_user.is_root? ? :admin : :default
-      protected_attributes[role].include?(attribute)
+      protected_attributes[current_role].include?(attribute)
     end
   end
 

data/app/views/admin/resources/edit.html.erb

@@ -9,6 +9,19 @@
     <small><%= list_actions %></small>
   </h2>
 
+  <% if headless_mode? && params[:action] == 'edit' %>
+    <script type="text/javascript">
+      $(document).ready(function () {
+        parent.Typus.resource_attribute = "#<%= params[:attribute] %>";
+        parent.Typus.resource_id = '<%= @item.id %>';
+        parent.Typus.resource_to_label = '<%= @item.to_label %>';
+        <% if flash.keys.any? && !params[:_input] %>
+          parent.Typus.parent_location_reload = true;
+        <% end %>
+      });
+    </script>
+  <% end %>
+
   <%= display_flash_message %>
   <%= render 'edit' %>
 

data/app/views/admin/templates/_dragonfly_form_preview.html.erb

@@ -10,9 +10,6 @@
     <ul style="margin: 0 0 0 15px!important;">
       <li><strong>File name:</strong> <%= attachment.name %></li>
       <li><strong>File type:</strong> <%= attachment.mime_type %></li>
-      <% if @item.respond_to?(:created_at) %>
-        <li><strong>Upload date:</strong> <%= @item.created_at %></li>
-      <% end %>
       <li><strong>Dimensions:</strong> <%= attachment.width %> x <%= attachment.height %></li>
     </ul>
   </div>

data/app/views/admin/templates/_text_with_ckeditor_and_assets.html.erb

@@ -27,7 +27,7 @@
     insert_picture = <<-DATA
   <small>
     #{link_to "Insert picture",
-              {:controller => "/admin/assets", :layout => 'admin/headless', :input => input},
+              {:controller => "/admin/assets", :_popup => true, :_input => input},
               {:class => "iframe", :style => "font-size: 10px; background: black; color: white; padding: 2px 5px; -moz-border-radius: 3px; -webkit-border-radius: 3px;"}}
   </small>
     DATA

data/app/views/helpers/admin/base/_apps.html.erb

@@ -10,10 +10,8 @@
 
   <% admin_user.applications.each do |application| %>
 
-    <% app_id = application.parameterize %>
-
     <%
-      apps = admin_user.application(application)
+      app_id, apps = application.parameterize, admin_user.application(application)
       if (params[:application] == app_id) || (@resource && apps.include?(@resource.model_name))
         klass = 'active'
       end

data/lib/generators/templates/config/initializers/typus.rb

@@ -1,7 +1,7 @@
 Typus.setup do |config|
 
   # Application name.
-  config.admin_title = "<%= options[:admin_title] %>"
+  # config.admin_title = "Typus"
   # config.admin_sub_title = ""
 
   # When mailer_sender is set, password recover is enabled. This email
@@ -13,7 +13,7 @@ Typus.setup do |config|
   #     config.action_mailer.default_url_options = { :host => 'localhost:3000' }
   #
   # This is a required Rails configuration. In production it must be the actual
-  # actual host of your application
+  # actual host of your application.
   #
   # config.mailer_sender = "admin@example.com"
 
@@ -25,7 +25,7 @@ Typus.setup do |config|
   # Run `rails g typus:migration` if you need an advanced authentication system.
   # config.authentication = :none
 
-  # Define username and password for +:http_basic+ authentication
+  # Define username and password for +:http_basic+ authentication.
   # config.username = "admin"
   # config.password = "columbia"
 

data/lib/generators/templates/config/typus/README

@@ -1,10 +1,9 @@
 # Models
 
 This is an example of a **Typus** enabled model with all available options.
-You can use this example to customize your YAML files which only have set the
-most common settings.
+Use this example as reference to customize your YAML files.
 
-    Post:
+    Entry:
       fields:
         default: id, title, category_id, created_at, is_published?
         list: id, title, category_id, created_at, is_published?
@@ -40,17 +39,16 @@ most common settings.
 
 # Roles
 
-In this file you can configure the actions available for each of your models
-on the application. You can also use the 'all' shortcut to allow the user the
-access to all actions.
+This is an example of a roles file. Use this example as reference to customize
+your YAML files.
 
     admin:
-      Post: create, read, update, delete
+      Entry: create, read, update, delete
       Category: create, read, update, delete
-      TypusUser: all
+      AdminUser: all
 
     editor:
-      Post: create, read, update
+      Entry: create, read, update
       Category: read, update
 
 You can also define `resources` which are not related to a model, for example

data/lib/generators/templates/config/typus/application.yml

@@ -1,5 +1,3 @@
-# Typus Models Configuration File
-#
 # Use the README file as a reference to customize settings.
 
 <%= configuration[:base] %>

data/lib/generators/templates/config/typus/application_roles.yml

@@ -1,6 +1,4 @@
-# Typus Roles Configuration File
-#
 # Use the README file as a reference to customize settings.
 
 admin:
-<%= configuration[:roles] %>
+  <%= configuration[:roles] %>

data/lib/generators/templates/config/typus/typus.yml

@@ -1,5 +1,3 @@
-# Typus Models Configuration File
-#
 # Use the README file as a reference to customize settings.
 
 <%= options[:user_class_name] %>:

data/lib/generators/templates/config/typus/typus_roles.yml

@@ -1,5 +1,3 @@
-# Typus Roles Configuration File
-#
 # Use the README file as a reference to customize settings.
 
 admin:

data/lib/generators/typus/config_generator.rb

@@ -4,99 +4,54 @@ module Typus
 
       source_root File.expand_path("../../templates", __FILE__)
 
-      class_option :admin_title, :default => Rails.root.basename
-
       desc <<-MSG
 Description:
-  Creates configuration files and stores them in `config/typus`.
+  Creates configuration files.
 
       MSG
 
       def generate_config
         copy_file "config/typus/README"
-        if (@configuration = generate_yaml_files)[:base].present?
-          %w(application.yml application_roles.yml).each do |file|
-            template "config/typus/#{file}", "config/typus/#{timestamp}_#{file}"
+        generate_yaml.each do |key, value|
+          if (@configuration = value)[:base].present?
+            template "config/typus/application.yml", "config/typus/#{key}.yml"
+            template "config/typus/application_roles.yml", "config/typus/#{key}_roles.yml"
           end
         end
       end
 
       protected
 
-      def timestamp
-        Time.zone.now.to_s(:number)
-      end
-
       def configuration
         @configuration
       end
 
-      def generate_yaml_files
+      def generate_yaml
         Typus.reload!
 
-        configuration = { :base => "", :roles => "" }
-
-        Typus.application_models.sort { |x,y| x <=> y }.each do |model|
-
-          next if Typus.models.include?(model)
-
-          klass = model.constantize
-
-          # Detect all relationships except polymorphic belongs_to using reflection.
-          relationships = [ :belongs_to, :has_and_belongs_to_many, :has_many, :has_one ].map do |relationship|
-                            klass.reflect_on_all_associations(relationship).reject { |i| i.options[:polymorphic] }.map { |i| i.name.to_s }
-                          end.flatten.sort
+        configuration = {}
+        models = Typus.application_models.reject { |m| Typus.models.include?(m) }.map { |m| m.constantize }
 
-          ##
-          # Model fields for:
-          #
-          # - Default
-          # - Form
-          #
+        models.each do |model|
+          configuration[model.table_name] = {}
 
-          rejections = %w( ^id$
-                           created_at created_on updated_at updated_on deleted_at
-                           salt crypted_password
-                           password_salt persistence_token single_access_token perishable_token
-                           _type$ type
-                           _file_size$ )
+          relationships = [ :has_many, :has_one ].map do |relationship|
+                            model.reflect_on_all_associations(relationship).map { |i| i.name.to_s }
+                          end.flatten.join(", ")
 
-          default_rejections = (rejections + %w( password password_confirmation )).join("|")
-          form_rejections = (rejections + %w( position )).join("|")
+          rejections = %w( ^id$ _type$ type created_at created_on updated_at updated_on deleted_at ).join("|")
+          fields = model.columns.map(&:name).reject { |f| f.match(rejections) }.join(", ")
 
-          fields = klass.columns.map(&:name)
-          default = fields.reject { |f| f.match(default_rejections) }
-          form = fields.reject { |f| f.match(form_rejections) }
-
-          # Model defaults.
-          order_by = "position" if default.include?("position")
-          filters = "created_at" if fields.include?("created_at")
-          search = ( %w(name title) & default ).join(", ")
-
-          # We want attributes of belongs_to relationships to be shown in our
-          # field collections if those are not polymorphic.
-          [ default, form ].each do |fields|
-            fields << klass.reflect_on_all_associations(:belongs_to).reject { |i| i.options[:polymorphic] }.map { |i| i.name.to_s }
-            fields.flatten!
-          end
-
-          configuration[:base] << <<-RAW
-#{klass}:
+          configuration[model.table_name][:base] = <<-RAW
+#{model}:
   fields:
-    default: #{default.join(", ")}
-    form: #{form.join(", ")}
-  order_by: #{order_by}
-  relationships: #{relationships.join(", ")}
-  filters: #{filters}
-  search: #{search}
-  application: #{options[:admin_title]}
-
-          RAW
-
-          configuration[:roles] << <<-RAW
-  #{klass}: create, read, update, delete
+    default: #{fields}
+    form: #{fields}
+  relationships: #{relationships}
+  application: Application
           RAW
 
+          configuration[model.table_name][:roles] = "#{model}: create, read, update, delete"
         end
 
         configuration

data/lib/generators/typus/controller_generator.rb

@@ -8,7 +8,7 @@ module Typus
 
       desc <<-MSG
 Description:
-  Generates admin controllers for the given resource
+  Generates admin controllers for the given resource.
 
       MSG
 

data/lib/generators/typus/initializers_generator.rb

@@ -4,11 +4,9 @@ module Typus
 
       source_root File.expand_path("../../templates", __FILE__)
 
-      class_option :admin_title, :default => Rails.root.basename
-
       desc <<-MSG
 Description:
-  Copies all Typus initializers into your application.
+  Copies Typus initializers into your application.
 
       MSG
 

data/lib/generators/typus/typus_generator.rb

@@ -19,7 +19,7 @@ Description:
   This generator creates required files to enable an admin panel which allows
   trusted users to edit structured content.
 
-  To enable session authentication run `rails g typus:migration`.
+  To enable session authentication run `rails generate typus:migration`.
 
       DESC
 

data/lib/generators/typus/views_generator.rb

@@ -6,7 +6,7 @@ module Typus
 
       desc <<-MSG
 Description:
-  Copies all Typus views to your application.
+  Copies Typus views into your application.
 
       MSG
 

data/lib/support/hash.rb

@@ -5,12 +5,7 @@ class Hash
   end
 
   def cleanup
-    whitelist = %w(controller action id
-                   input
-                   layout
-                   resource resource_id resource_action
-                   selected
-                   back_to)
+    whitelist = %w(controller action id _input _popup resource attribute)
     delete_if { |k, v| !whitelist.include?(k) }
   end
 

data/lib/typus/authentication/base.rb

@@ -6,6 +6,10 @@ module Typus
         @admin_user
       end
 
+      def current_role
+        admin_user.role.to_sym
+      end
+
       def authenticate; end
       def check_if_user_can_perform_action_on_user; end
       def check_if_user_can_perform_action_on_resources; end

data/lib/typus/controller/bulk.rb

@@ -25,10 +25,10 @@ module Typus
           send(params[:batch_action], ids)
         else
           notice = if action.empty?
-                     Typus::I18n.t("No bulk action selected.")
-                   else
-                     Typus::I18n.t("Items must be selected in order to perform actions on them. No items have been changed.")
-                   end
+            Typus::I18n.t("No bulk action selected.")
+          else
+            Typus::I18n.t("Items must be selected in order to perform actions on them. No items have been changed.")
+          end
           redirect_to :back, :notice => notice
         end
       end

data/lib/typus/controller/headless.rb

@@ -6,7 +6,7 @@ module Typus
         base.before_filter :set_resources_action_for_headless_on_index, :only => [:index, :trash]
         base.before_filter :set_resources_action_for_headless, :only => [:new, :create, :edit, :show]
         base.helper_method :headless_mode?
-        base.layout :set_headless_layout
+        base.layout :headless_layout
       end
 
       def set_resources_action_for_headless_on_index
@@ -19,29 +19,13 @@ module Typus
       end
       private :set_resources_action_for_headless
 
-      def set_headless_layout
-        params[:layout] || "admin/base"
-      end
-      private :set_headless_layout
-
-      def headless_mode_with_custom_action_is_enabled?
-        headless_mode? && params[:resource_action]
-      end
-      private :headless_mode_with_custom_action_is_enabled?
-
-      def set_headless_resource_actions
-        body = params[:resource_action].titleize
-        url = { :controller => params[:resource].tableize,
-                :action => params[:resource_action],
-                :resource => params[:resource],
-                :resource_id => params[:resource_id],
-                :return_to => params[:return_to] }
-        options = { :target => "_parent" }
-        add_resource_action(body, url, options)
+      def headless_layout
+        headless_mode? ? "admin/headless" : "admin/base"
       end
+      private :headless_layout
 
       def headless_mode?
-        params[:layout] == "admin/headless"
+        params[:_popup]
       end
 
     end

data/lib/typus/orm/base.rb

@@ -101,10 +101,10 @@ module Typus
         options = read_model_config['fields']['options']
 
         boolean = if options && options['booleans'] && boolean = options['booleans'][attribute.to_s]
-                    boolean.is_a?(String) ? boolean.extract_settings : boolean
-                  else
-                    ["True", "False"]
-                  end
+          boolean.is_a?(String) ? boolean.extract_settings : boolean
+        else
+          ["True", "False"]
+        end
 
         [[boolean.first, "true"], [boolean.last, "false"]]
       end

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.0.rc19"
+  VERSION = "3.1.0"
 end

data/lib/typus.rb

@@ -197,7 +197,7 @@ module Typus
       detect_application_models.map do |model|
         class_name = model.sub(/\.rb$/,"").camelize
         klass = class_name.split("::").inject(Object) { |klass,part| klass.const_get(part) }
-        class_name if is_active_record?(klass) || is_mongoid?(klass)
+        class_name if is_active_record?(klass) && !is_mongoid?(klass)
       end.compact
     end
 

data/vendor/assets/chosen/chosen.css

@@ -81,7 +81,7 @@
   width: 18px;
 }
 .chzn-container-single .chzn-single div b {
-  background: url('../chosen-sprite.png') no-repeat 0 1px;
+  background: url('/assets/chosen-sprite.png') no-repeat 0 1px;
   display: block;
   width: 100%;
   height: 100%;
@@ -92,14 +92,14 @@
   white-space: nowrap;
 }
 .chzn-container-single .chzn-search input {
-  background: #fff url('../chosen-sprite.png') no-repeat 100% -20px;
-  background: url('../chosen-sprite.png') no-repeat 100% -20px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
-  background: url('../chosen-sprite.png') no-repeat 100% -20px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('../chosen-sprite.png') no-repeat 100% -20px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('../chosen-sprite.png') no-repeat 100% -20px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-  background: url('../chosen-sprite.png') no-repeat 100% -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('../chosen-sprite.png') no-repeat 100% -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('../chosen-sprite.png') no-repeat 100% -20px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: #fff url('/assets/chosen-sprite.png') no-repeat 100% -20px;
+  background: url('/assets/chosen-sprite.png') no-repeat 100% -20px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+  background: url('/assets/chosen-sprite.png') no-repeat 100% -20px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('/assets/chosen-sprite.png') no-repeat 100% -20px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('/assets/chosen-sprite.png') no-repeat 100% -20px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+  background: url('/assets/chosen-sprite.png') no-repeat 100% -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('/assets/chosen-sprite.png') no-repeat 100% -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('/assets/chosen-sprite.png') no-repeat 100% -20px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
   margin: 1px 0;
   padding: 4px 20px 4px 5px;
   outline: 0;
@@ -196,7 +196,7 @@
   width: 8px;
   height: 9px;
   font-size: 1px;
-  background: url('../chosen-sprite.png') right top no-repeat;
+  background: url('/assets/chosen-sprite.png') right top no-repeat;
 }
 .chzn-container-multi .chzn-choices .search-choice .search-choice-close:hover {
   background-position: right -9px;
@@ -321,14 +321,14 @@
 .chzn-rtl .chzn-results .group-option { padding-left: 0; padding-right: 20px; }
 .chzn-rtl.chzn-container-active .chzn-single-with-drop div { border-right: none; }
 .chzn-rtl .chzn-search input {
-  background: url('../chosen-sprite.png') no-repeat -38px -20px, #ffffff;
-  background: url('../chosen-sprite.png') no-repeat -38px -20px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
-  background: url('../chosen-sprite.png') no-repeat -38px -20px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);  
-  background: url('../chosen-sprite.png') no-repeat -38px -20px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-  background: url('../chosen-sprite.png') no-repeat -38px -20px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-  background: url('../chosen-sprite.png') no-repeat -38px -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('../chosen-sprite.png') no-repeat -38px -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('../chosen-sprite.png') no-repeat -38px -20px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, #ffffff;
+  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);  
+  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background: url('/assets/chosen-sprite.png') no-repeat -38px -20px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
   padding: 4px 5px 4px 20px;
 }
 /* @end */

data/vendor/assets/fancybox/jquery.fancybox-1.3.4.css

@@ -35,7 +35,7 @@
 	left: 0;
 	width: 40px;
 	height: 480px;
-	background-image: url('../fancybox.png');
+	background-image: url('/assets/fancybox.png');
 }
 
 #fancybox-overlay {
@@ -99,7 +99,7 @@
 	right: -15px;
 	width: 30px;
 	height: 30px;
-	background: transparent url('../fancybox.png') -40px 0px;
+	background: transparent url('/assets/fancybox.png') -40px 0px;
 	cursor: pointer;
 	z-index: 1103;
 	display: none;
@@ -137,7 +137,7 @@
 	width: 35%;
 	cursor: pointer;
 	outline: none;
-	background: transparent url('../blank.gif');
+	background: transparent url('/assets/blank.gif');
 	z-index: 1102;
 	display: none;
 }
@@ -163,12 +163,12 @@
 }
 
 #fancybox-left-ico {
-	background-image: url('../fancybox.png');
+	background-image: url('/assets/fancybox.png');
 	background-position: -40px -30px;
 }
 
 #fancybox-right-ico {
-	background-image: url('../fancybox.png');
+	background-image: url('/assets/fancybox.png');
 	background-position: -40px -60px;
 }
 
@@ -199,13 +199,13 @@
 	top: -20px;
 	left: 0;
 	width: 100%;
-	background-image: url('../fancybox-x.png');
+	background-image: url('/assets/fancybox-x.png');
 }
 
 #fancybox-bg-ne {
 	top: -20px;
 	right: -20px;
-	background-image: url('../fancybox.png');
+	background-image: url('/assets/fancybox.png');
 	background-position: -40px -162px;
 }
 
@@ -213,14 +213,14 @@
 	top: 0;
 	right: -20px;
 	height: 100%;
-	background-image: url('../fancybox-y.png');
+	background-image: url('/assets/fancybox-y.png');
 	background-position: -20px 0px;
 }
 
 #fancybox-bg-se {
 	bottom: -20px;
 	right: -20px;
-	background-image: url('../fancybox.png');
+	background-image: url('/assets/fancybox.png');
 	background-position: -40px -182px; 
 }
 
@@ -228,14 +228,14 @@
 	bottom: -20px;
 	left: 0;
 	width: 100%;
-	background-image: url('../fancybox-x.png');
+	background-image: url('/assets/fancybox-x.png');
 	background-position: 0px -20px;
 }
 
 #fancybox-bg-sw {
 	bottom: -20px;
 	left: -20px;
-	background-image: url('../fancybox.png');
+	background-image: url('/assets/fancybox.png');
 	background-position: -40px -142px;
 }
 
@@ -243,13 +243,13 @@
 	top: 0;
 	left: -20px;
 	height: 100%;
-	background-image: url('../fancybox-y.png');
+	background-image: url('/assets/fancybox-y.png');
 }
 
 #fancybox-bg-nw {
 	top: -20px;
 	left: -20px;
-	background-image: url('../fancybox.png');
+	background-image: url('/assets/fancybox.png');
 	background-position: -40px -122px;
 }
 
@@ -282,7 +282,7 @@
 
 #fancybox-title-over {
 	padding: 10px;
-	background-image: url('../fancy_title_over.png');
+	background-image: url('/assets/fancy_title_over.png');
 	display: block;
 }
 
@@ -306,7 +306,7 @@
 
 #fancybox-title-float-left {
 	padding: 0 0 0 15px;
-	background: url('../fancybox.png') -40px -90px no-repeat;
+	background: url('/assets/fancybox.png') -40px -90px no-repeat;
 }
 
 #fancybox-title-float-main {
@@ -314,12 +314,12 @@
 	line-height: 29px;
 	font-weight: bold;
 	padding: 0 0 3px 0;
-	background: url('../fancybox-x.png') 0px -40px;
+	background: url('/assets/fancybox-x.png') 0px -40px;
 }
 
 #fancybox-title-float-right {
 	padding: 0 0 0 15px;
-	background: url('../fancybox.png') -55px -90px no-repeat;
+	background: url('/assets/fancybox.png') -55px -90px no-repeat;
 }
 
 /* IE6 */

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: typus
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc19
-  prerelease: 6
+  version: 3.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Francesc Esplugas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000Z
+date: 2011-09-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70366422637200 !ruby/object:Gem::Requirement
+  requirement: &70152604331140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70366422637200
+  version_requirements: *70152604331140
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70366422636760 !ruby/object:Gem::Requirement
+  requirement: &70152604330700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70366422636760
+  version_requirements: *70152604330700
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70366422636260 !ruby/object:Gem::Requirement
+  requirement: &70152604330180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70366422636260
+  version_requirements: *70152604330180
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
   content.
 email:
@@ -320,13 +320,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1042388540158321156
+      hash: 4352251271305818957
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 4352251271305818957
 requirements: []
 rubyforge_project: typus
 rubygems_version: 1.8.9