typus 3.1.0.rc6 → 3.1.0.rc7

data/.gitignore

@@ -12,3 +12,13 @@ log/*.log
 test/fixtures/rails_app/public/system/*
 test/fixtures/rails_app/tmp/*
 tmp/**/*
+
+# Ignore generated documentation
+.yardoc
+doc/*.html
+doc/css
+doc/js
+doc/Admin
+doc/Typus
+doc/ActiveRecord
+

data/.gitmodules

@@ -0,0 +1,6 @@
+[submodule "doc/wiki"]
+	path = doc/wiki
+	url = git@github.com:typus/typus.wiki.git
+[submodule "doc/site"]
+	path = doc/site
+	url = git@github.com:typus/typus.github.com.git

data/.yardopts

@@ -0,0 +1,6 @@
+--main doc/wiki/home.md
+--output doc/site
+-e ./doc/yard/setup.rb
+-
+README.md
+doc/wiki/*

data/Gemfile

@@ -10,7 +10,7 @@ gem 'jquery-rails'
 gem 'acts_as_list'
 gem 'acts_as_tree'
 gem 'factory_girl'
-gem "rails-trash"
+gem "rails-trash", "~> 1.1.1"
 
 # Asset Management
 gem "dragonfly", "~> 0.9"

data/README.md

@@ -15,19 +15,19 @@
 
 ## Links
 
-- [Documentation](https://github.com/fesplugas/typus/wiki)
-- [Issues](https://github.com/fesplugas/typus/issues)
+- [Documentation](https://github.com/typus/typus/wiki)
+- [Issues](https://github.com/typus/typus/issues)
 - [Demo](http://demo.typuscms.com/) ([Code][code])
-- [Source Code](http://github.com/fesplugas/typus)
+- [Source Code](http://github.com/typus/typus)
 - [Mailing List](http://groups.google.com/group/typus)
 - [Gems](http://rubygems.org/gems/typus)
-- [Contributors List](http://github.com/fesplugas/typus/contributors)
+- [Contributors List](http://github.com/typus/typus/contributors)
 
 ## Installing
 
 Add **Typus** to your `Gemfile`
 
-    gem 'typus', :git => 'git://github.com/fesplugas/typus.git', :branch => '3-1-unstable'
+    gem 'typus', :git => 'git://github.com/typus/typus.git', :branch => '3-1-unstable'
 
 Update your bundle, run the generator and start the application server:
 
@@ -43,5 +43,5 @@ Typus is released under the MIT license.
 
 [paperclip]: http://rubygems.org/gems/paperclip
 [dragonfly]: http://rubygems.org/gems/dragonfly
-[code]: https://github.com/fesplugas/typus/tree/master/test/fixtures/rails_app
-[locales]: https://github.com/fesplugas/typus/tree/master/config/locales
+[code]: https://github.com/typus/typus/tree/master/test/fixtures/rails_app
+[locales]: https://github.com/typus/typus/tree/master/config/locales

data/Rakefile

@@ -11,7 +11,8 @@ desc 'Test the typus plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  # t.pattern = 'test/**/*_test.rb'
+  t.pattern = 'test/app/controllers/**/*_test.rb'
   t.verbose = true
 end
 
@@ -52,3 +53,15 @@ namespace :test do
   end
 
 end
+
+require 'yard'
+
+YARD::Rake::YardocTask.new do |t|
+  t.files   = []
+  t.options = []
+end
+
+YARD::Rake::YardocTask.new 'yard:changed' do |t|
+  t.files   = `git status | grep '.rb' | grep modified | grep -v yard | cut -d' ' -f4`.split
+  t.options = []
+end

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

@@ -12,8 +12,8 @@ $(document).ready(function() {
   });
 
   $(".iframe").fancybox({
-    'width': '75%',
-    'height': '100%',
+    'width': 720,
+    'height': '90%',
     'autoScale': false,
     'transitionIn': 'none',
     'transitionOut': 'none',
@@ -22,6 +22,17 @@ $(document).ready(function() {
     'scrolling': false,
   });
 
+    $(".action-toggle").click(function() {
+      var status = this.checked;
+      $('input.action-select').each(function() { this.checked = status; });
+      $('.action-toggle').each(function() { this.checked = status; });
+    });
+
+  if ($('textarea.ckeditor').length > 0) {
+    var data = $('textarea');
+    $.each(data, function(i) { CKEDITOR.replace(data[i].id); });
+  }
+
 });
 
 function setConfirmUnload(on) {

data/app/assets/stylesheets/typus/screen.css

@@ -191,6 +191,10 @@ fieldset.inputs { }
 
 fieldset.buttons { }
 
+  fieldset.buttons ol li {
+    display: inline;
+  }
+
 /* @end */
 
 /* @group Content Tables */

data/app/controllers/admin/account_controller.rb

@@ -15,8 +15,7 @@ class Admin::AccountController < Admin::BaseController
 
   def create
     user = Typus.user_class.generate(:email => params[:typus_user][:email])
-    user.status = true
-    redirect_to user.save ? { :action => "show", :id => user.token } : { :action => :new }
+    redirect_to user ? { :action => "show", :id => user.token } : { :action => :new }
   end
 
   def forgot_password
@@ -36,7 +35,7 @@ class Admin::AccountController < Admin::BaseController
     flash[:notice] = Typus::I18n.t("Please set a new password.")
     typus_user = Typus.user_class.find_by_token!(params[:id])
     session[:typus_user_id] = typus_user.id
-    redirect_to :controller => "/admin/#{Typus.user_class.to_resource}", :action => "edit", :id => typus_user.id
+    redirect_to params[:return_to] || { :controller => "/admin/#{Typus.user_class.to_resource}", :action => "edit", :id => typus_user.id }
   end
 
   private

data/app/controllers/admin/resources_controller.rb

@@ -1,11 +1,11 @@
 class Admin::ResourcesController < Admin::BaseController
 
   include Typus::Controller::Actions
-  include Typus::Controller::ActsAs
   include Typus::Controller::Associations
   include Typus::Controller::Autocomplete
   include Typus::Controller::Filters
   include Typus::Controller::Format
+  include Typus::Controller::Headless
 
   Whitelist = [:edit, :update, :destroy, :toggle, :position, :relate, :unrelate]
 
@@ -26,8 +26,12 @@ class Admin::ResourcesController < Admin::BaseController
 
     respond_to do |format|
       format.html do
-        add_resource_action(default_action.titleize, {:action => default_action}, {})
-        add_resource_action("Trash", {:action => "destroy"}, {:confirm => "#{Typus::I18n.t("Trash")}?", :method => 'delete'})
+        if headless_mode_with_custom_action_is_enabled?
+          set_headless_resource_actions
+        else
+          add_resource_action(default_action.titleize, {:action => default_action}, {})
+          add_resource_action("Trash", {:action => "destroy"}, {:confirm => "#{Typus::I18n.t("Trash")}?", :method => 'delete'})
+        end
         generate_html
       end
 
@@ -52,15 +56,14 @@ class Admin::ResourcesController < Admin::BaseController
   # relationship between these items.
   #
   def create
-    @item = @resource.new(params[@object_name])
+    @item = @resource.new
+    @item.assign_attributes(params[@object_name], :as => :admin)
 
     set_attributes_on_create
 
     respond_to do |format|
       if @item.save
-        format.html do
-          params[:resource] ? create_with_back_to : redirect_on_success
-        end
+        format.html { redirect_on_success }
         format.json { render :json => @item, :status => :created, :location => @item }
       else
         format.html { render :action => "new" }
@@ -88,7 +91,8 @@ class Admin::ResourcesController < Admin::BaseController
     attributes = params[:attribute] ? { params[:attribute] => nil } : params[@object_name]
 
     respond_to do |format|
-      if @item.update_attributes(attributes)
+      role = admin_user.is_root? ? :admin : :default
+      if @item.update_attributes(attributes, :as => role)
         set_attributes_on_update
         format.html { redirect_on_success }
         format.json { render :json => @item }
@@ -177,10 +181,37 @@ class Admin::ResourcesController < Admin::BaseController
   def redirect_on_success
     path = params.dup.cleanup
 
-    if action_after_save.eql?('index')
+    # Redirects to { :action => 'index' }
+    if params[:_save]
       path.delete_if { |k, v| %w(action id).include?(k) }
-    else
-      path.merge!(:action => action_after_save, :id => @item.id)
+    end
+
+    ##
+    # Here what we basically do is to associate objects after they have been
+    # created. It's similar to calling `relate` but which the difference that
+    # we are creating a new record.
+    #
+    # We have two objects, detect the relationship_between them and then
+    # call the related method.
+    #
+    if params[:_saveandassign]
+      item_class = params[:resource].typus_constantize
+      # For some reason we are forced to set the /admin prefix to the controller
+      # when working with namespaced stuff.
+      options = { :controller => "/admin/#{item_class.to_resource}" }
+      assoc = item_class.relationship_with(@resource).to_s
+      unused_path, notice, alert = send("set_#{assoc}_association", item_class, options)
+      path.merge!(:action => 'edit', :id => @item.id)
+    end
+
+    # Redirects to { :action => 'new' }
+    if params[:_addanother]
+      path.merge!(:action => 'new', :id => nil)
+    end
+
+    # Redirects to { :action => 'edit' => :id => @item.id }
+    if params[:_continue]
+      path.merge!(:action => 'edit', :id => @item.id)
     end
 
     message = (params[:action] == 'create') ? "%{model} successfully created." : "%{model} successfully updated."
@@ -189,29 +220,8 @@ class Admin::ResourcesController < Admin::BaseController
     redirect_to path, :notice => notice
   end
 
-  ##
-  # Here what we basically do is to associate objects after they have been
-  # created. It's similar to calling `relate` but which the difference that
-  # we are creating a new record.
-  #
-  # We have two objects, detect the relationship_between them and then
-  # call the related method.
-  #
-  def create_with_back_to
-    item_class = params[:resource].typus_constantize
-    # For some reason we are forced to set the /admin prefix to the controller
-    # when working with namespaced stuff.
-    options = { :controller => "/admin/#{item_class.to_resource}" }
-    assoc = item_class.relationship_with(@resource).to_s
-    send("set_#{assoc}_association", item_class, options)
-  end
-
   def default_action
     @resource.typus_options_for(:default_action_on_item)
   end
 
-  def action_after_save
-    @resource.typus_options_for(:action_after_save)
-  end
-
 end

data/app/controllers/admin/session_controller.rb

@@ -32,7 +32,7 @@ class Admin::SessionController < Admin::BaseController
   end
 
   def set_locale
-    I18n.locale = I18n.default_locale
+    I18n.locale = Typus::I18n.default_locale
   end
 
   def user_scope

data/app/helpers/admin/base_helper.rb

@@ -1,44 +1,39 @@
-module Admin
-  module BaseHelper
+module Admin::BaseHelper
 
-    def title(page_title)
-      content_for(:title) { page_title }
-    end
+  def title(page_title)
+    content_for(:title) { page_title }
+  end
 
-    def header
-      render "admin/helpers/base/header"
-    end
+  def header
+    render "helpers/admin/base/header"
+  end
 
-    def has_root_path?
-      Rails.application.routes.routes.map(&:name).include?("root")
-    end
+  def has_root_path?
+    Rails.application.routes.routes.map(&:name).include?("root")
+  end
 
-    def apps
-      render "admin/helpers/base/apps"
-    end
+  def apps
+    render "helpers/admin/base/apps"
+  end
 
-    def login_info
-      unless admin_user.is_a?(FakeUser)
-        render "admin/helpers/base/login_info"
-      end
-    end
+  def login_info
+    render "helpers/admin/base/login_info" unless admin_user.is_a?(FakeUser)
+  end
 
-    def admin_sign_out_path
-      case Typus.authentication
-      when :devise
-        send("destroy_#{Typus.user_class_name.underscore}_session")
-      else
-        destroy_admin_session_path
-      end
+  def admin_sign_out_path
+    case Typus.authentication
+    when :devise
+      send("destroy_#{Typus.user_class_name.underscore}_session")
+    else
+      destroy_admin_session_path
     end
+  end
 
-    def display_flash_message(message = flash)
-      if message.keys.any?
-        render "admin/helpers/base/flash_message",
-               :flash_type => message.keys.first,
-               :message => message
-      end
+  def display_flash_message(message = flash)
+    if message.keys.any?
+      locals = { :flash_type => message.keys.first, :message => message }
+      render "helpers/admin/base/flash_message", locals
     end
-
   end
+
 end

data/app/helpers/admin/dashboard_helper.rb

@@ -1,10 +1,8 @@
-module Admin
-  module DashboardHelper
-
-    def resources(admin_user)
-      available = Typus.resources.delete_if { |r| !(admin_user.is_a?(FakeUser) || admin_user.resources.include?(r)) }
-      render "admin/helpers/dashboard/resources", :resources => available
-    end
+module Admin::DashboardHelper
 
+  def resources(admin_user)
+    available = Typus.resources.delete_if { |r| !(admin_user.is_a?(FakeUser) || admin_user.resources.include?(r)) }
+    render "helpers/admin/dashboard/resources", :resources => available
   end
+
 end

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

@@ -0,0 +1,82 @@
+module Admin::Resources::DataTypes::BelongsToHelper
+
+  def typus_belongs_to_field(attribute, form)
+    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.typus_constantize
+              end
+    related_fk = association.foreign_key
+
+    # TODO: Use the build_add_new method.
+    if admin_user.can?('create', related)
+      options = { :controller => "/admin/#{related.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])
+      message = link_to Typus::I18n.t("Add New"), options, { :class => 'iframe' }
+    end
+
+    # Set the template.
+    template = if Typus.autocomplete && (related.respond_to?(:roots) || !(related.count > Typus.autocomplete))
+                 "admin/templates/belongs_to"
+               else
+                 "admin/templates/belongs_to_with_autocomplete"
+               end
+
+    # Set the values.
+    values = if related.respond_to?(:roots)
+               expand_tree_into_select_field(related.roots, related_fk)
+             elsif Typus.autocomplete && !(related.count > Typus.autocomplete)
+               related.order(related.typus_order_by).map { |p| [p.to_label, p.id] }
+             end
+
+    render template,
+           :association => association,
+           :resource => @resource,
+           :attribute => attribute,
+           :form => form,
+           :related_fk => related_fk,
+           :related => related,
+           :message => message,
+           :label_text => @resource.human_attribute_name(attribute),
+           :values => values,
+           :html_options => { :disabled => attribute_disabled?(attribute) },
+           :options => { :include_blank => true }
+  end
+
+  def table_belongs_to_field(attribute, item)
+    if att_value = item.send(attribute)
+      action = item.send(attribute).class.typus_options_for(:default_action_on_item)
+      if admin_user.can?(action, att_value.class.name)
+        link_to att_value.to_label, :controller => "/admin/#{att_value.class.to_resource}", :action => action, :id => att_value.id
+      else
+        att_value.to_label
+      end
+    else
+      "—".html_safe
+    end
+  end
+
+  def display_belongs_to(item, attribute)
+    data = item.send(attribute)
+    link_to data.to_label, { :controller => data.class.to_resource,
+                             :action => data.class.typus_options_for(:default_action_on_item),
+                             :id => data.id }
+  end
+
+  def belongs_to_filter(filter)
+    att_assoc = @resource.reflect_on_association(filter.to_sym)
+    class_name = att_assoc.options[:class_name] || filter.capitalize.camelize
+    resource = class_name.typus_constantize
+
+    items = [[Typus::I18n.t("View all %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase.pluralize), ""]]
+    items += resource.order(resource.typus_order_by).map { |v| [v.to_label, v.id] }
+  end
+
+end

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

@@ -0,0 +1,28 @@
+module Admin::Resources::DataTypes::BooleanHelper
+
+  def display_boolean(item, attribute)
+    data = item.send(attribute)
+    boolean_assoc = item.class.typus_boolean(attribute)
+    (data ? boolean_assoc.rassoc("true") : boolean_assoc.rassoc("false")).first
+  end
+
+  def table_boolean_field(attribute, item)
+    status = item.send(attribute)
+    boolean_assoc = item.class.typus_boolean(attribute)
+    human_boolean = (status ? boolean_assoc.rassoc("true") : boolean_assoc.rassoc("false")).first
+
+    options = { :controller => "/admin/#{item.class.to_resource}",
+                :action => "toggle",
+                :id => item.id,
+                :field => attribute.gsub(/\?$/, '') }
+    confirm = Typus::I18n.t("Change %{attribute}?", :attribute => item.class.human_attribute_name(attribute).downcase)
+    link_to Typus::I18n.t(human_boolean), options, :confirm => confirm
+  end
+
+  def boolean_filter(filter)
+    values  = @resource.typus_boolean(filter)
+    items = [[Typus::I18n.t("Show by %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase), ""]]
+    items += values.map { |k, v| [Typus::I18n.t(k.humanize), v] }
+  end
+
+end

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

@@ -0,0 +1,12 @@
+module Admin::Resources::DataTypes::DateHelper
+
+  def date_filter(filter)
+    values = %w(today last_few_days last_7_days last_30_days)
+    items = [[Typus::I18n.t("Show all dates"), ""]]
+    items += values.map { |v| [Typus::I18n.t(v.humanize), v] }
+  end
+
+  alias :datetime_filter :date_filter
+  alias :timestamp_filter :date_filter
+
+end

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

@@ -0,0 +1,17 @@
+module Admin::Resources::DataTypes::DatetimeHelper
+
+  def table_datetime_field(attribute, item)
+    if field = item.send(attribute)
+      I18n.localize(field, :format => item.class.typus_date_format(attribute))
+    end
+  end
+
+  alias :table_date_field :table_datetime_field
+  alias :table_time_field :table_datetime_field
+  alias :table_timestamp_field :table_datetime_field
+
+  def display_datetime(item, attribute)
+    I18n.l(item.send(attribute), :format => @resource.typus_date_format(attribute))
+  end
+
+end

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

@@ -0,0 +1,37 @@
+module Admin::Resources::DataTypes::DragonflyHelper
+
+  def table_dragonfly_field(attribute, item)
+    options = { :height => 25, :width => 25 }
+    typus_dragonfly_preview(item, attribute, options)
+  end
+
+  def link_to_detach_attribute_for_dragonfly(attribute)
+    validators = @item.class.validators.delete_if { |i| i.class != ActiveModel::Validations::PresenceValidator }.map { |i| i.attributes }.flatten.map { |i| i.to_s }
+    attachment = @item.send(attribute)
+
+    if attachment.present? && !validators.include?(attribute) && attachment
+      attribute_i18n = @item.class.human_attribute_name(attribute)
+      message = Typus::I18n.t("Remove")
+      label_text = <<-HTML
+#{attribute_i18n}
+<small>#{link_to message, { :action => 'update', :id => @item.id, :attribute => attribute, :_continue => true }, :confirm => Typus::I18n.t("Are you sure?")}</small>
+      HTML
+      label_text.html_safe
+    end
+  end
+
+  def typus_dragonfly_preview(item, attachment, options = {})
+    data = item.send(attachment)
+    return unless data
+
+    if data.mime_type =~ /^image\/.+/
+      render "admin/templates/dragonfly_preview",
+             :preview => data.process(:thumb, Typus.image_preview_size).url,
+             :thumb => data.process(:thumb, Typus.image_thumb_size).url,
+             :options => options
+    else
+      link_to data.name, data.url
+    end
+  end
+
+end

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

@@ -0,0 +1,3 @@
+module Admin::Resources::DataTypes::FloatHelper
+
+end

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

@@ -0,0 +1,24 @@
+module Admin::Resources::DataTypes::HasAndBelongsToManyHelper
+
+  def table_has_and_belongs_to_many_field(attribute, item)
+    item.send(attribute).map { |i| i.to_label }.join(", ")
+  end
+
+  alias :table_has_many_field :table_has_and_belongs_to_many_field
+
+  def typus_form_has_and_belongs_to_many(field)
+    setup_relationship(field)
+    build_pagination
+
+    # TODO: Find a cleaner way to add these actions ...
+    @resource_actions = [["Edit", { :action => "edit", :layout => 'admin/headless' }, { :class => 'iframe' }],
+                         ["Unrelate", { :resource_id => @item.id,
+                                        :resource => @resource.model_name,
+                                        :action => "unrelate"},
+                                      { :confirm =>"Unrelate?" }]]
+
+    locals = { :association_name => @association_name, :add_new => build_add_new, :table => build_relationship_table }
+    render "admin/templates/has_n", locals
+  end
+
+end

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

@@ -0,0 +1,43 @@
+module Admin::Resources::DataTypes::HasManyHelper
+
+  def has_many_filter(filter)
+    att_assoc = @resource.reflect_on_association(filter.to_sym)
+    class_name = att_assoc.options[:class_name] || filter.classify
+    resource = class_name.typus_constantize
+
+    items = [[Typus::I18n.t("View all %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase.pluralize), ""]]
+    items += resource.order(resource.typus_order_by).map { |v| [v.to_label, v.id] }
+  end
+
+  alias :has_and_belongs_to_many_filter :has_many_filter
+
+  def typus_form_has_many(field)
+    setup_relationship(field)
+
+    options = @reflection.through_reflection ? {} : { @reflection.foreign_key => @item.id }
+
+    count_items_to_relate = @model_to_relate.order(@model_to_relate.typus_order_by).count - @item.send(field).count
+
+    build_pagination
+
+    # If we are on a through_reflection set the association name!
+    @resource_actions = if @reflection.through_reflection
+                          [["Edit", { :action => "edit", :layout => 'admin/headless' }, { :class => 'iframe' }],
+                           ["Unrelate", { :resource_id => @item.id,
+                                          :resource => @resource.model_name,
+                                          :action => "unrelate",
+                                          :association_name => @association_name},
+                                        { :confirm => "Unrelate?" } ]]
+                        else
+                          [["Edit", { :action => "edit", :layout => 'admin/headless' }, { :class => 'iframe' }],
+                           ["Trash", { :resource_id => @item.id,
+                                       :resource => @resource.model_name,
+                                       :action => "destroy" },
+                                     { :confirm => "Trash?" } ]]
+                         end
+
+    locals = { :association_name => @association_name, :add_new => build_add_new(options), :table => build_relationship_table }
+    render "admin/templates/has_n", locals
+  end
+
+end

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

@@ -0,0 +1,23 @@
+module Admin::Resources::DataTypes::HasOneHelper
+
+  def typus_form_has_one(field)
+    setup_relationship(field)
+
+    @items = Array.new
+    if item = @item.send(field)
+      @items << item
+    end
+
+    # TODO: Find a cleaner way to add these actions ...
+    @resource_actions = [["Edit", {:action=>"edit"}, {}],
+                         ["Trash", { :resource_id => @item.id, :resource => @resource.model_name, :action => "destroy" }, { :confirm => "Trash?" }]]
+
+    options = { :resource_id => nil, @reflection.foreign_key => @item.id }
+
+    render "admin/templates/has_one",
+           :association_name => @association_name,
+           :add_new => @items.empty? ? build_add_new(options) : nil,
+           :table => build_relationship_table
+  end
+
+end