typus 3.1.0.rc6 → 3.1.0.rc7

data/lib/typus/controller/{acts_as.rb → acts_as_list.rb}

@@ -1,15 +1,16 @@
 module Typus
   module Controller
-    module ActsAs
+    module ActsAsList
 
       ##
-      # Change item position:
+      # This module is designed to work with `acts_as_list`.
       #
-      #   params[:go] = 'move_to_top'
+      # Available positions are:
       #
-      # Available positions are move_to_top, move_higher, move_lower, move_to_bottom.
-      #
-      # NOTE: Only works if `acts_as_list` is installed.
+      # - move_to_top
+      # - move_higher
+      # - move_lower
+      # - move_to_bottom
       #
       def position
         @item.send(params[:go])

data/lib/typus/controller/associations.rb

@@ -26,17 +26,15 @@ module Typus
       #   => ...
       #
       def relate
-        resource_class = params[:related][:model].typus_constantize
-        association_name = params[:related][:association_name].tableize
+        resource_class = params[:resource].typus_constantize
+        association_name = resource_class.table_name
 
-        if params[:related][:id].present? && (item = resource_class.find(params[:related][:id]))
-          @item.send(association_name) << item
-          notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
-        else
-          notice = Typus::I18n.t("Please, select an option.")
-        end
+        item = resource_class.find(params[:resource_id])
+        @item.send(association_name) << item
+
+        notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
 
-        redirect_to :back, :notice => notice
+        redirect_to params[:return_to], :notice => notice
       end
 
       ##
@@ -79,7 +77,7 @@ module Typus
         options.merge!(:action => 'edit', :id => @item.send(association_name).id)
         notice = Typus::I18n.t("%{model} successfully updated.", :model => item_class.model_name.human)
 
-        redirect_to options, :notice => notice
+        [options, notice, nil]
       end
 
       ##
@@ -98,7 +96,7 @@ module Typus
 
         options.merge!(:action => 'edit', :id => item.id)
 
-        redirect_to options, :notice => notice, :alert => alert
+        [options, notice, alert]
       end
 
       ##
@@ -117,7 +115,7 @@ module Typus
           alert = @item.errors.full_messages
         end
 
-        redirect_to options, :notice => notice, :alert => alert
+        [options, notice, alert]
       end
 
       ##
@@ -140,7 +138,7 @@ module Typus
           options.merge!(:action => 'new', foreign_key => @item.id)
         end
 
-        redirect_to options, :notice => notice, :alert => alert
+        [options, notice, alert]
       end
 
     end

data/lib/typus/controller/autocomplete.rb

@@ -7,7 +7,7 @@ module Typus
           params.merge!(:search => params[:term])
           get_objects
           @items = @resource.limit(20)
-          render :json => @items.map { |i| { "id" => i.id, "label" => i.to_label, "value" => i.to_label, "name" => i.to_label } }
+          render :json => @items.map { |i| { "id" => i.id, "name" => i.to_label } }
         end
       end
 

data/lib/typus/controller/bulk.rb

@@ -0,0 +1,70 @@
+module Typus
+  module Controller
+    module Bulk
+
+      def self.included(base)
+        base.helper_method :bulk_actions
+        base.before_filter :set_bulk_action, :only => [:index]
+        base.before_filter :set_bulk_action_for_trash, :only => [:trash]
+      end
+
+      def set_bulk_action
+        add_bulk_action("Move to Trash", "bulk_destroy")
+      end
+      private :set_bulk_action
+
+      # This only happens if we try to access the trash, which won't happen
+      # if trash module is not loaded.
+      def set_bulk_action_for_trash
+        add_bulk_action("Restore from Trash", "bulk_restore")
+      end
+      private :set_bulk_action_for_trash
+
+      def bulk
+        if (ids = params[:selected_item_ids])
+          send(params[:batch_action], ids)
+        else
+          notice = Typus::I18n.t("Items must be selected in order to perform actions on them. No items have been changed.")
+          redirect_to :back, :notice => notice
+        end
+      end
+
+      def bulk_destroy(ids)
+        ids.each { |id| @resource.destroy(id) }
+        notice = Typus::I18n.t("Successfully deleted #{ids.count} entries.")
+        redirect_to :back, :notice => notice
+      end
+      private :bulk_destroy
+
+      def bulk_restore(ids)
+        ids.each { |id| @resource.deleted.find(id).restore }
+        notice = Typus::I18n.t("Successfully restored #{ids.count} entries.")
+        redirect_to :back, :notice => notice
+      end
+      private :bulk_restore
+
+      def add_bulk_action(*args)
+        bulk_actions
+        @bulk_actions << args unless args.empty?
+      end
+      protected :add_bulk_action
+
+      def prepend_bulk_action(*args)
+        bulk_actions
+        @bulk_actions = @bulk_actions.unshift(args) unless args.empty?
+      end
+      protected :prepend_bulk_action
+
+      def append_bulk_action(*args)
+        bulk_actions
+        @bulk_actions = @bulk_actions.concat([args]) unless args.empty?
+      end
+      protected :append_bulk_action
+
+      def bulk_actions
+        @bulk_actions ||= []
+      end
+
+    end
+  end
+end

data/lib/typus/controller/filters.rb

@@ -2,23 +2,31 @@ module Typus
   module Controller
     module Filters
 
+      def self.included(base)
+        base.helper_method :predefined_filters
+      end
+
       protected
 
       def add_predefined_filter(*args)
-        @predefined_filters ||= []
+        predefined_filters
         @predefined_filters << args unless args.empty?
       end
 
       def prepend_predefined_filter(*args)
-        @predefined_filters ||= []
+        predefined_filters
         @predefined_filters = @predefined_filters.unshift(args) unless args.empty?
       end
 
       def append_predefined_filter(*args)
-        @predefined_filters ||= []
+        predefined_filters
         @predefined_filters = @predefined_filters.concat([args]) unless args.empty?
       end
 
+      def predefined_filters
+        @predefined_filters ||= []
+      end
+
     end
   end
 end

data/lib/typus/controller/headless.rb

@@ -5,6 +5,7 @@ module Typus
       def self.included(base)
         base.before_filter :set_resources_action_for_headless_on_index, :only => [:index]
         base.before_filter :set_resources_action_for_headless, :only => [:new, :create, :edit, :show]
+        base.helper_method :headless_mode?
         base.layout :set_headless_layout
       end
 
@@ -14,7 +15,7 @@ module Typus
       private :set_resources_action_for_headless_on_index
 
       def set_resources_action_for_headless
-        add_resources_action("Back to list", {:action => 'index', :id => nil}, {})
+        add_resources_action("All Entries", {:action => 'index', :id => nil}, {})
       end
       private :set_resources_action_for_headless
 
@@ -23,6 +24,26 @@ module Typus
       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)
+      end
+
+      def headless_mode?
+        params[:layout] == "admin/headless"
+      end
+
     end
   end
 end

data/lib/typus/controller/trash.rb

@@ -1,3 +1,9 @@
+##
+# This module is designed to work with `rails-trash`. Add it to your `Gemfile`
+# if you have plans to use it:
+#
+#     gem "rails-trash", "~> 1.1.1"
+#
 module Typus
   module Controller
     module Trash
@@ -19,8 +25,8 @@ module Typus
         respond_to do |format|
           format.html do
             # Actions by resource.
-            add_resource_action('Restore', {:action => 'restore'}, {:confirm => Typus::I18n.t("Restore %{resource}?", :resource => @resource.model_name.human)})
-            add_resource_action('Delete Permanently', {:action => 'wipe'}, {:confirm => Typus::I18n.t("Delete Permanently %{resource}?", :resource => @resource.model_name.human)})
+            add_resource_action 'Restore', { :action => 'restore' }, { :confirm => Typus::I18n.t("Restore %{resource}?", :resource => @resource.model_name.human) }
+            add_resource_action 'Delete Permanently', { :action => 'wipe' }, { :confirm => Typus::I18n.t("Delete Permanently?") }
             # Generate and render.
             generate_html
             render 'index'
@@ -31,16 +37,14 @@ module Typus
       end
 
       def restore
-        set_deleted
-        @resource.find(params[:id]).restore
+        @resource.restore(params[:id])
         redirect_to :back, :notice => Typus::I18n.t("%{resource} recovered from trash.", :resource => @resource.name)
       rescue ActiveRecord::RecordNotFound
         redirect_to :back, :notice => Typus::I18n.t("%{resource} can't be recovered from trash.", :resource => @resource.name)
       end
 
       def wipe
-        set_deleted
-        item = @resource.find(params[:id])
+        item = @resource.find_in_trash(params[:id])
         item.disable_trash { item.destroy }
         redirect_to :back, :notice => Typus::I18n.t("%{resource} has been successfully removed from trash.", :resource => @resource.name)
       end

data/lib/typus/orm/active_record/admin_user_v1.rb

@@ -1,4 +1,5 @@
 require 'typus/orm/active_record/user/instance_methods'
+require 'typus/orm/active_record/user/class_methods'
 
 module Typus
   module Orm
@@ -9,8 +10,14 @@ module Typus
 
           def enable_as_typus_user
 
+            extend Typus::Orm::ActiveRecord::User::ClassMethods
+
+            include InstanceMethods
+            include Typus::Orm::ActiveRecord::User::InstanceMethods
+
             attr_accessor :password
-            attr_protected :status
+
+            attr_protected :role, :status
 
             validates :email, :presence => true, :uniqueness => true, :format => { :with => Typus::Regex::Email }
 
@@ -26,29 +33,11 @@ module Typus
 
             serialize :preferences
 
-            def authenticate(email, password)
+            def self.authenticate(email, password)
               user = find_by_email_and_status(email, true)
               user && user.authenticated?(password) ? user : nil
             end
 
-            def generate(*args)
-              options = args.extract_options!
-              options[:password] ||= Typus.password
-              options[:role] ||= Typus.master_role
-              new :email => options[:email], :password => options[:password], :role => options[:role]
-            end
-
-            def role
-              Typus::Configuration.roles.keys.sort
-            end
-
-            def locale
-              Typus.locales
-            end
-
-            include InstanceMethods
-            include Typus::Orm::ActiveRecord::User::InstanceMethods
-
           end
 
         end

data/lib/typus/orm/active_record/admin_user_v2.rb

@@ -1,4 +1,5 @@
 require 'typus/orm/active_record/user/instance_methods'
+require 'typus/orm/active_record/user/class_methods'
 require 'bcrypt'
 
 module Typus
@@ -10,9 +11,15 @@ module Typus
 
           def has_admin
 
+            extend Typus::Orm::ActiveRecord::User::ClassMethods
+
+            include InstanceMethodsOnActivation
+            include Typus::Orm::ActiveRecord::User::InstanceMethods
+
             attr_reader   :password
             attr_accessor :password_confirmation
-            attr_protected :status
+
+            attr_protected :role, :status
 
             validates :email, :presence => true, :uniqueness => true, :format => { :with => Typus::Regex::Email }
             validates :password, :confirmation => true
@@ -20,22 +27,11 @@ module Typus
 
             validate :password_must_be_strong
 
-            include InstanceMethodsOnActivation
-            include Typus::Orm::ActiveRecord::User::InstanceMethods
-
             serialize :preferences
 
             before_save :set_token
 
-            def self.role
-              Typus::Configuration.roles.keys.sort
-            end
-
-            def self.locale
-              Typus.locales
-            end
-
-            def self.authenticate(email, password)
+            def authenticate(email, password)
               user = find_by_email_and_status(email, true)
               user && user.authenticate(password) ? user : nil
             end

data/lib/typus/orm/active_record/class_methods.rb

@@ -61,8 +61,13 @@ module Typus
               dragonfly = respond_to?(:dragonfly_attachment_classes) && dragonfly_attachment_classes.map { |i| i.attribute }.include?(field)
               paperclip = respond_to?(:attachment_definitions) && attachment_definitions.try(:has_key?, field)
 
-              if dragonfly || paperclip
-                fields_with_type[field.to_s] = :file
+              if respond_to?(:dragonfly_attachment_classes) && dragonfly_attachment_classes.map { |i| i.attribute }.include?(field)
+                fields_with_type[field.to_s] = :dragonfly
+                next
+              end
+
+              if respond_to?(:attachment_definitions) && attachment_definitions.try(:has_key?, field)
+                fields_with_type[field.to_s] = :paperclip
                 next
               end
 

data/lib/typus/orm/active_record/user/class_methods.rb

@@ -0,0 +1,29 @@
+module Typus
+  module Orm
+    module ActiveRecord
+      module User
+        module ClassMethods
+
+          def generate(*args)
+            options = args.extract_options!
+            options[:password] ||= Typus.password
+            options[:role] ||= Typus.master_role
+            user = new :email => options[:email], :password => options[:password]
+            user.status = true
+            user.role = options[:role]
+            user.save ? user : false
+          end
+
+          def role
+            Typus::Configuration.roles.keys.sort
+          end
+
+          def locale
+            Typus.locales
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/typus/resources.rb

@@ -12,9 +12,6 @@ module Typus
       yield self
     end
 
-    mattr_accessor :action_after_save
-    @@action_after_save = "edit"
-
     mattr_accessor :default_action_on_item
     @@default_action_on_item = "edit"
 

data/lib/typus/version.rb

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

data/lib/typus.rb

@@ -23,9 +23,10 @@ module Typus
 
   module Controller
     autoload :Actions, "typus/controller/actions"
-    autoload :ActsAs, "typus/controller/acts_as"
+    autoload :ActsAsList, "typus/controller/acts_as_list"
     autoload :Associations, "typus/controller/associations"
     autoload :Autocomplete, "typus/controller/autocomplete"
+    autoload :Bulk, "typus/controller/bulk"
     autoload :FeaturedImage, "typus/controller/featured_image"
     autoload :Filters, "typus/controller/filters"
     autoload :Format, "typus/controller/format"

data/test/app/controllers/admin/account_controller_test.rb

@@ -28,7 +28,11 @@ class Admin::AccountControllerTest < ActionController::TestCase
       assert_redirected_to new_admin_account_path
     end
 
-    should "verify send_password redirects to new when there are no admin users"
+    should "verify send_password redirects to new when there are no admin users" do
+      post :send_password, :typus_user => { :email => "john@locke.com" }
+      assert_response :redirect
+      assert_redirected_to :action => :new
+    end
 
     should "not sign_up invalid emails" do
       post :create, :typus_user => { :email => "example.com" }
@@ -83,6 +87,13 @@ class Admin::AccountControllerTest < ActionController::TestCase
       assert_redirected_to :controller => "/admin/typus_users", :action => "edit", :id => @typus_user.id
     end
 
+    should "redirect user to dashboard if return_to params is set" do
+      get :show, :id => @typus_user.token, :return_to => "/admin"
+      assert_equal @typus_user.id, @request.session[:typus_user_id]
+      assert_response :redirect
+      assert_redirected_to "http://test.host/admin"
+    end
+
     should "test_should_return_404_on_reset_passsword_if_token_is_not_valid" do
       assert_raises ActiveRecord::RecordNotFound do
         get :show, :id => "unexisting"

data/test/app/controllers/admin/base_controller_test.rb

@@ -13,10 +13,10 @@ class Admin::BaseControllerTest < ActionController::TestCase
   test "user_guide is not displayed when user is not logged in" do
     get :user_guide
     assert_response :redirect
-    assert_redirected_to new_admin_session_path # (:back_to => '/admin/user_guide')
+    assert_redirected_to new_admin_session_path
   end
 
-  test "user_guide display" do
+  test "user_guide is displayed when user is logged in" do
     admin_sign_in
     get :user_guide
     assert_response :success

data/test/app/controllers/admin/dashboard_controller_test.rb

@@ -72,10 +72,6 @@ class Admin::DashboardControllerTest < ActionController::TestCase
       get :show
     end
 
-    teardown do
-      TypusUser.delete_all
-    end
-
     should "render dashboard" do
       assert_response :success
       assert_template "show"
@@ -112,10 +108,6 @@ class Admin::DashboardControllerTest < ActionController::TestCase
       admin_sign_in
     end
 
-    teardown do
-      TypusUser.delete_all
-    end
-
     should "block users_on_the_fly" do
       @typus_user.status = false
       @typus_user.save

data/test/app/controllers/admin/{status_controller_test.rb → resource/status_controller_test.rb}

@@ -4,7 +4,7 @@ require "test_helper"
 
   What's being tested here?
 
-    - Resource controller (which is not associated with a model).
+    - Resource controller.
 
 =end
 
@@ -27,7 +27,7 @@ class Admin::StatusControllerTest < ActionController::TestCase
     reset_session
     get :index
     assert_response :redirect
-    assert_redirected_to new_admin_session_path # (:back_to => '/admin/status')
+    assert_redirected_to new_admin_session_path
   end
 
 end

data/test/app/controllers/admin/resources/acts_as_list_test.rb

@@ -0,0 +1,48 @@
+require "test_helper"
+
+=begin
+
+  What's being tested here?
+
+    - Typus::Controller::ActsAsList
+
+=end
+
+class Admin::CategoriesControllerTest < ActionController::TestCase
+
+  setup do
+    @request.session[:typus_user_id] = Factory(:typus_user).id
+    @request.env['HTTP_REFERER'] = '/admin/categories'
+  end
+
+  test "get position" do
+    first_category = Factory(:category, :position => 1)
+    second_category = Factory(:category, :position => 2)
+
+    second_category.name = nil
+    second_category.save(:validate => false)
+
+    # "verify referer"
+    get :position, :id => first_category.id, :go => 'move_lower'
+    assert_response :redirect
+    assert_redirected_to @request.env['HTTP_REFERER']
+
+    # "position item one step down"
+    get :position, :id => first_category.id, :go => 'move_lower'
+    assert_equal "Category successfully updated.", flash[:notice]
+    assert assigns(:item).position.eql?(2)
+
+    # "position item one step up"
+    get :position, :id => second_category.id, :go => 'move_higher'
+    assert assigns(:item).position.eql?(1)
+
+    # "position top item to bottom"
+    get :position, :id => first_category.id, :go => 'move_to_bottom'
+    assert assigns(:item).position.eql?(2)
+
+    # "position bottom item to top"
+    get :position, :id => second_category.id, :go => 'move_to_top'
+    assert assigns(:item).position.eql?(1)
+  end
+
+end

data/test/app/controllers/admin/{assets_controller_test.rb → resources/assets_controller_test.rb.old}

@@ -100,17 +100,6 @@ class Admin::AssetsControllerTest < ActionController::TestCase
         assert_redirected_to :action => "edit", :id => Asset.last.id, :layout => "admin/headless"
       end
 
-      should "redirect to index with custom layout" do
-        Typus::Resources.expects(:action_after_save).returns("index")
-
-        assert_difference('Asset.count') do
-          post :create, :asset => @asset, :layout => "admin/headless"
-        end
-
-        assert_response :redirect
-        assert_redirected_to :action => "index", :layout => "admin/headless"
-      end
-
       should "render new with custom layout after an error" do
         post :create, :asset => {}, :layout => "admin/headless"
         assert_response :success
@@ -136,19 +125,11 @@ class Admin::AssetsControllerTest < ActionController::TestCase
       should "render update with custom layout after an error" do
         post :update, :id => @asset.id, :asset => { :dragonfly_required => nil }, :layout => "admin/headless"
         assert_response :success
-        assert_template "admin/helpers/resources/_errors"
+        assert_template "helpers/admin/resources/resources/_errors"
         assert_template "admin/resources/edit"
         assert_template "admin/headless"
       end
 
-      should "redirect to index with custom layout" do
-        Typus::Resources.expects(:action_after_save).returns("index")
-        asset = {:caption => "My Caption", :dragonfly_required => File.new("#{Rails.root}/public/images/rails.png")}
-        post :update, :id => @asset.id, :asset => asset, :layout => "admin/headless"
-        assert_response :redirect
-        assert_redirected_to :action => "index", :layout => "admin/headless"
-      end
-
     end
 
   end