typus 3.0.8 → 3.0.9

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

@@ -0,0 +1,11 @@
+module Typus
+  module Orm
+    module Mongo
+      module ClassMethods
+
+        include Typus::Orm::Base
+
+      end
+    end
+  end
+end

data/lib/typus/resources.rb

@@ -1,7 +1,8 @@
 module Typus
   module Resources
 
-    # Setup Typus::Resources. This should be run from an initializer.
+    ##
+    # Setup Typus::Resources:
     #
     #     Typus::Resources.setup do |config|
     #       config.default_action_on_item = "index"

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.0.8"
+  VERSION = "3.0.9"
 end

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

@@ -88,7 +88,7 @@ class Admin::AccountControllerTest < ActionController::TestCase
     end
 
     should "test_should_create_admin_user_session_and_redirect_user_to_its_details" do
-      get :show, { :id => @typus_user.token }
+      get :show, :id => @typus_user.token
 
       assert_equal @typus_user.id, @request.session[:typus_user_id]
       assert_response :redirect
@@ -96,7 +96,9 @@ class Admin::AccountControllerTest < ActionController::TestCase
     end
 
     should "test_should_return_404_on_reset_passsword_if_token_is_not_valid" do
-      assert_raise(ActiveRecord::RecordNotFound) { get :show, { :id => "unexisting" } }
+      assert_raises ActiveRecord::RecordNotFound do
+        get :show, :id => "unexisting"
+      end
     end
 
   end

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

@@ -24,17 +24,17 @@ class Admin::AssetsControllerTest < ActionController::TestCase
     end
 
     should "verify there is a file link" do
-      get :edit, { :id => @asset.id }
+      get :edit, :id => @asset.id
       assert_match /media/, @response.body
     end
 
     should "verify dragonfly can be removed" do
-      get :edit, { :id => @asset.id }
+      get :edit, :id => @asset.id
       assert_match /Remove/, @response.body
 
       assert @asset.dragonfly_uid.present?
 
-      get :update, { :id => @asset.id, :attribute => "dragonfly" }
+      get :update, :id => @asset.id, :attribute => "dragonfly"
       assert_response :redirect
       assert_redirected_to "/admin/assets/edit/#{@asset.id}"
       assert_equal "Asset successfully updated.", flash[:notice]
@@ -44,10 +44,10 @@ class Admin::AssetsControllerTest < ActionController::TestCase
     end
 
     should "verify dragonfly_required can not removed" do
-      get :edit, { :id => @asset.id }
+      get :edit, :id => @asset.id
       assert_no_match /Remove required file/, @response.body
 
-      get :update, { :id => @asset.id, :attribute => "dragonfly_required" }
+      get :update, :id => @asset.id, :attribute => "dragonfly_required"
       assert_response :success
 
       @asset.reload
@@ -56,7 +56,7 @@ class Admin::AssetsControllerTest < ActionController::TestCase
 
     should "verify message on polymorphic relationship" do
       asset = Factory(:asset)
-      get :edit, { :id => asset.id, :resource => @post.class.name, :resource_id => @post.id }
+      get :edit, :id => asset.id, :resource => @post.class.name, :resource_id => @post.id
       assert_select 'body div#flash', "Cancel adding a new asset?"
     end
 
@@ -65,20 +65,20 @@ class Admin::AssetsControllerTest < ActionController::TestCase
   context "Headless" do
 
     should "render index with a custom layout" do
-      get :index, { :layout => "admin/headless" }
+      get :index, :layout => "admin/headless"
       assert_response :success
       assert_template "admin/headless"
     end
 
     should "render new with a custom layout" do
-      get :new, { :layout => "admin/headless" }
+      get :new, :layout => "admin/headless"
       assert_response :success
       assert_template "admin/headless"
     end
 
     should "render edit with a custom layout" do
       asset = Factory(:asset)
-      get :edit, { :id => asset.id, :layout => "admin/headless" }
+      get :edit, :id => asset.id, :layout => "admin/headless"
       assert_response :success
       assert_template "admin/headless"
     end
@@ -125,13 +125,13 @@ class Admin::AssetsControllerTest < ActionController::TestCase
 
       should "redirect to edit with custom layout" do
         asset = {:caption => "My Caption", :dragonfly_required => File.new("#{Rails.root}/public/images/rails.png")}
-        post :update, { :id => @asset.id, :asset => asset, :layout => "admin/headless" }
+        post :update, :id => @asset.id, :asset => asset, :layout => "admin/headless"
         assert_response :redirect
         assert_redirected_to :action => "edit", :id => @asset.id, :layout => "admin/headless"
       end
 
       should "render update with custom layout after an error" do
-        post :update, { :id => @asset.id, :asset => { :caption => nil }, :layout => "admin/headless" }
+        post :update, :id => @asset.id, :asset => { :dragonfly_required => nil }, :layout => "admin/headless"
         assert_response :success
         assert_template "admin/helpers/resources/_errors"
         assert_template "admin/resources/edit"
@@ -141,7 +141,7 @@ class Admin::AssetsControllerTest < ActionController::TestCase
       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" }
+        post :update, :id => @asset.id, :asset => asset, :layout => "admin/headless"
         assert_response :redirect
         assert_redirected_to :action => "index", :layout => "admin/headless"
       end

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

@@ -44,30 +44,23 @@ class Admin::CategoriesControllerTest < ActionController::TestCase
 
     should "position item one step down" do
       get :position, { :id => @first_category.id, :go => 'move_lower' }
-
       assert_equal "Category successfully updated.", flash[:notice]
-      assert_equal 2, @first_category.reload.position
-      assert_equal 1, @second_category.reload.position
+      assert_equal 2, assigns(:item).position
     end
 
     should "position item one step up" do
       get :position, { :id => @second_category.id, :go => 'move_higher' }
-
-      assert_equal "Category successfully updated.", flash[:notice]
-      assert_equal 2, @first_category.reload.position
-      assert_equal 1, @second_category.reload.position
+      assert_equal 1, assigns(:item).position
     end
 
     should "position top item to bottom" do
       get :position, { :id => @first_category.id, :go => 'move_to_bottom' }
-      assert_equal "Category successfully updated.", flash[:notice]
-      assert_equal 2, @first_category.reload.position
+      assert_equal 2, assigns(:item).position
     end
 
     should "position bottom item to top" do
       get :position, { :id => @second_category.id, :go => 'move_to_top' }
-      assert_equal "Category successfully updated.", flash[:notice]
-      assert_equal 1, @second_category.reload.position
+      assert_equal 1, assigns(:item).position
     end
 
   end
@@ -93,7 +86,7 @@ class Admin::CategoriesControllerTest < ActionController::TestCase
 
     should "unrelate category from post" do
       assert_difference('@category.posts.count', -1) do
-        post :unrelate, { :id => @category.id, :resource => 'Post', :resource_id => @category.posts.first }
+        post :unrelate, :id => @category.id, :resource => 'Post', :resource_id => @category.posts.first
       end
 
       assert_response :redirect

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

@@ -38,7 +38,7 @@ class Admin::CommentsControllerTest < ActionController::TestCase
       @post = comment.post
 
       assert_difference('@post.comments.count', -1) do
-        post :unrelate, { :id => comment.id, :resource => 'Post', :resource_id => @post.id }
+        post :unrelate, :id => comment.id, :resource => 'Post', :resource_id => @post.id
       end
 
       assert comment.reload.post.nil?

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

@@ -66,7 +66,7 @@ class Admin::ImageHoldersControllerTest < ActionController::TestCase
 
     should "work" do
       assert_difference('@bird.image_holders.count', -1) do
-        post :unrelate, { :id => @image_holder.id, :resource => "Bird", :resource_id => @bird.id }
+        post :unrelate, :id => @image_holder.id, :resource => "Bird", :resource_id => @bird.id
       end
     end
 

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

@@ -68,7 +68,7 @@ class Admin::InvoicesControllerTest < ActionController::TestCase
     end
 
     should "work for unrelate Invoice from Order" do
-      post :unrelate, { :id => @invoice.id, :resource => 'Order', :resource_id => @order.id }
+      post :unrelate, :id => @invoice.id, :resource => 'Order', :resource_id => @order.id
       assert @order.reload.invoice.nil?
       assert_equal "Order successfully updated.", flash[:notice]
     end

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

@@ -60,26 +60,26 @@ class Admin::PostsControllerTest < ActionController::TestCase
 
     should "create" do
       assert_difference('Post.count') do
-        post :create, { :post => { :title => 'This is another title', :body => 'Body' } }
+        post :create, :post => @post.attributes
         assert_response :redirect
         assert_redirected_to "/admin/posts/edit/#{Post.last.id}"
       end
     end
 
     should "render show" do
-      get :show, { :id => @post.id }
+      get :show, :id => @post.id
       assert_response :success
       assert_template 'show'
     end
 
     should "render edit" do
-      get :edit, { :id => @post.id }
+      get :edit, :id => @post.id
       assert_response :success
       assert_template 'edit'
     end
 
     should "update" do
-      post :update, { :id => @post.id, :title => 'Updated' }
+      post :update, :id => @post.id, :post => { :title => 'Updated' }
       assert_response :redirect
       assert_redirected_to "/admin/posts/edit/#{@post.id}"
     end
@@ -96,7 +96,7 @@ class Admin::PostsControllerTest < ActionController::TestCase
 
       should "work" do
         assert !@post.published
-        get :toggle, { :id => @post.id, :field => "published" }
+        get :toggle, :id => @post.id, :field => "published"
 
         assert_response :redirect
         assert_redirected_to @request.env["HTTP_REFERER"]
@@ -107,7 +107,7 @@ class Admin::PostsControllerTest < ActionController::TestCase
       should "render edit post when validation fails" do
         @post.body = nil
         @post.save(:validate => false)
-        get :toggle, { :id => @post.id, :field => "published" }
+        get :toggle, :id => @post.id, :field => "published"
         assert_response :success
         assert_template "admin/resources/edit"
       end
@@ -120,28 +120,28 @@ class Admin::PostsControllerTest < ActionController::TestCase
 
     should "render index with accepted params" do
       @post.update_attributes(:published => true)
-      get :index, { :published => 'true' }
+      get :index, :published => 'true'
       assert_response :success
       assert_template 'index'
       assert assigns(:items).size.eql?(1)
 
-      get :index, { :published => 'false' }
+      get :index, :published => 'false'
       assert assigns(:items).size.eql?(0)
     end
 
     should "render index with accepted params - search" do
       @post.update_attributes(:title => "neinonon")
-      get :index, { :search => 'neinonon' }
+      get :index, :search => 'neinonon'
       assert_response :success
       assert_template 'index'
       assert assigns(:items).size.eql?(1)
 
-      get :index, { :search => 'unexisting' }
+      get :index, :search => 'unexisting'
       assert assigns(:items).size.eql?(0)
     end
 
     should "render index with non-accepted params" do
-      get :index, { :non_accepted_param => 'non_accepted_param' }
+      get :index, :non_accepted_param => 'non_accepted_param'
       assert_response :success
       assert_template 'index'
     end
@@ -247,14 +247,14 @@ class Admin::PostsControllerTest < ActionController::TestCase
 
     should "create an item and redirect to index" do
       assert_difference('Post.count') do
-        post :create, { :post => { :title => 'This is another title', :body => 'Body' } }
+        post :create, :post => @post.attributes
         assert_response :redirect
         assert_redirected_to :action => 'index'
       end
     end
 
     should "update an item and redirect to index" do
-      post :update, { :id => @post.id, :title => 'Updated' }
+      post :update, :id => @post.id, :post => { :title => 'Updated' }
       assert_response :redirect
       assert_redirected_to :action => 'index'
     end
@@ -323,7 +323,7 @@ title;status
 
       should "be able to edit any record" do
         Post.all.each do |post|
-          get :edit, { :id => post.id }
+          get :edit, :id => post.id
           assert_response :success
           assert_template 'edit'
         end
@@ -331,12 +331,12 @@ title;status
 
       should "verify_admin_updating_an_item_does_not_change_typus_user_id_if_not_defined" do
         _post = @post
-        post :update, { :id => @post.id, :post => { :title => 'Updated by admin' } }
+        post :update, :id => @post.id, :post => { :title => 'Updated by admin' }
         assert_equal _post.typus_user_id, @post.reload.typus_user_id
       end
 
       should "verify_admin_updating_an_item_does_change_typus_user_id_to_whatever_admin_wants" do
-        post :update, { :id => @post.id, :post => { :title => 'Updated', :typus_user_id => 108 } }
+        post :update, :id => @post.id, :post => { :title => 'Updated', :typus_user_id => 108 }
         assert_equal 108, @post.reload.typus_user_id
       end
 
@@ -356,25 +356,24 @@ title;status
 
       should "verify_editor_can_show_any_record" do
         Post.all.each do |post|
-          get :show, { :id => post.id }
+          get :show, :id => post.id
           assert_response :success
           assert_template 'show'
         end
       end
 
       should "verify_editor_tried_to_edit_a_post_owned_by_himself" do
-        post_ = Factory(:post, :typus_user => @typus_user)
-        get :edit, { :id => post_.id }
+        get :edit, :id => Factory(:post, :typus_user => @typus_user).id
         assert_response :success
       end
 
       should "verify_editor_tries_to_edit_a_post_owned_by_the_admin" do
-        get :edit, { :id => Factory(:post).id }
+        get :edit, :id => Factory(:post).id
         assert_response :unprocessable_entity
       end
 
       should "verify_editor_tries_to_show_a_post_owned_by_the_admin" do
-        get :show, { :id => Factory(:post).id }
+        get :show, :id => Factory(:post).id
         assert_response :success
       end
 
@@ -395,23 +394,24 @@ title;status
       should "verify_editor_tries_to_show_a_post_owned_by_the_admin when only user items" do
         Typus::Resources.expects(:only_user_items).returns(true)
         post = Factory(:post)
-        get :show, { :id => post.id }
+        get :show, :id => post.id
         assert_response :unprocessable_entity
       end
 
       should "verify_typus_user_id_of_item_when_creating_record" do
-        post :create, { :post => { :title => "Chunky Bacon", :body => "Lorem ipsum ..." } }
-        post_ = Post.find_by_title("Chunky Bacon")
+        assert_difference('Post.count') do
+          post :create, :post => { :title => "Chunky Bacon", :body => "Lorem ipsum ..." }
+        end
 
-        assert_equal @request.session[:typus_user_id], post_.typus_user_id
+        assert_equal @request.session[:typus_user_id], assigns(:item).typus_user_id
       end
 
       should "verify_editor_updating_an_item_does_not_change_typus_user_id" do
         [ 108, nil ].each do |typus_user_id|
           post_ = Factory(:post, :typus_user => @typus_user)
-          post :update, { :id => post_.id, :post => { :title => 'Updated', :typus_user_id => @typus_user.id } }
+          post :update, :id => post_.id, :post => { :title => 'Updated', :typus_user_id => @typus_user.id }
           post_updated = Post.find(post_.id)
-          assert_equal  @request.session[:typus_user_id], post_updated.typus_user_id
+          assert_equal @request.session[:typus_user_id], post_updated.typus_user_id
         end
       end
 
@@ -432,7 +432,7 @@ title;status
       end
 
       should "be able to destroy posts" do
-        get :destroy, { :id => Factory(:post).id, :method => :delete }
+        get :destroy, :id => Factory(:post).id, :method => :delete
 
         assert_response :redirect
         assert_equal "Post successfully removed.", flash[:notice]
@@ -458,7 +458,7 @@ title;status
 
       should "not be able to destroy posts" do
         assert_no_difference('Post.count') do
-          get :destroy, { :id => @post.id, :method => :delete }
+          get :destroy, :id => @post.id, :method => :delete
         end
         assert_response :unprocessable_entity
       end
@@ -544,7 +544,7 @@ title;status
     context "Edit" do
 
       setup do
-        get :edit, { :id => Factory(:post).id }
+        get :edit, :id => Factory(:post).id
       end
 
       should "render_edit_and_verify_presence_of_custom_partials" do
@@ -560,7 +560,7 @@ title;status
     context "Show" do
 
       setup do
-        get :show, { :id => Factory(:post).id }
+        get :show, :id => Factory(:post).id
       end
 
       should "render_show_and_verify_presence_of_custom_partials" do
@@ -627,7 +627,7 @@ title;status
           Typus::Resources.stubs(:default_action_on_item).returns(action)
           get :index
           Post.all.each do |post|
-            if post.owned_by?(@typus_user)
+            if @typus_user.owns?(post)
               assert_match "/posts/#{action}/#{post.id}", @response.body
             else
               assert_no_match /\/posts\/#{action}\/#{post.id}/, @response.body

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

@@ -19,7 +19,7 @@ class Admin::ProjectsControllerTest < ActionController::TestCase
   end
 
   should_eventually "be able to destroy items" do
-    get :destroy, { :id => @user.id, :method => :delete }
+    get :destroy, :id => @user.id, :method => :delete
 
     assert_response :redirect
     assert_equal "User successfully removed.", flash[:notice]

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

@@ -52,12 +52,12 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
     end
 
     should "not be able to change his role" do
-      post :update, { :id => @typus_user.id, :typus_user => { :role => 'editor' } }
+      post :update, :id => @typus_user.id, :typus_user => { :role => 'editor' }
       assert_response :unprocessable_entity
     end
 
     should "be able to update other users role" do
-      post :update, { :id => @typus_user_editor.id, :typus_user => { :role => 'admin' } }
+      post :update, :id => @typus_user_editor.id, :typus_user => { :role => 'admin' }
       assert_response :redirect
       assert_redirected_to "/admin/typus_users/edit/#{@typus_user_editor.id}"
       assert_equal "Typus user successfully updated.", flash[:notice]
@@ -79,19 +79,19 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
     end
 
     should "be able to edit his profile" do
-      get :edit, { :id => @editor.id }
+      get :edit, :id => @editor.id
       assert_response :success
     end
 
     should "be able to update his profile" do
-      post :update, { :id => @editor.id, :typus_user => { :role => 'editor' } }
+      post :update, :id => @editor.id, :typus_user => { :role => 'editor' }
       assert_response :redirect
       assert_redirected_to "/admin/typus_users/edit/#{@editor.id}"
       assert_equal "Typus user successfully updated.", flash[:notice]
     end
 
     should "not be able to change his role" do
-      post :update, { :id => @editor.id, :typus_user => { :role => 'admin' } }
+      post :update, :id => @editor.id, :typus_user => { :role => 'admin' }
       assert_response :unprocessable_entity
     end
 
@@ -106,26 +106,22 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
     end
 
     should "not be able to edit other profiles" do
-      user = Factory(:typus_user)
-      get :edit, { :id => user.id }
+      get :edit, :id => Factory(:typus_user).id
       assert_response :unprocessable_entity
     end
 
     should "not be able to update other profiles" do
-      user = Factory(:typus_user)
-      post :update, { :id => user.id, :typus_user => { :role => 'admin' } }
+      post :update, :id => Factory(:typus_user).id, :typus_user => { :role => 'admin' }
       assert_response :unprocessable_entity
     end
 
     should "not be able to destroy other profiles" do
-      user = Factory(:typus_user)
-      delete :destroy, :id => user.id
+      delete :destroy, :id => Factory(:typus_user).id
       assert_response :unprocessable_entity
     end
 
     should "not be able to toggle other profiles status" do
-      user = Factory(:typus_user)
-      get :toggle, { :id => user.id, :field => 'status' }
+      get :toggle, { :id => Factory(:typus_user).id, :field => 'status' }
       assert_response :unprocessable_entity
     end
 
@@ -138,21 +134,21 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
   context "Designer" do
 
     setup do
-      @designer = Factory(:typus_user, :email => "designer@example.com", :role => "designer")
+      @designer = Factory(:typus_user, :role => "designer")
       @request.session[:typus_user_id] = @designer.id
     end
 
     should "be able to edit his profile" do
-      get :edit, { :id => @designer.id }
+      get :edit, :id => @designer.id
       assert_response :success
     end
 
     should "be able to update his profile" do
-      post :update, { :id => @designer.id, :typus_user => { :role => 'designer', :email => 'designer@withafancydomain.com' } }
+      post :update, :id => @designer.id, :typus_user => { :role => 'designer', :email => 'designer@withafancydomain.com' }
       assert_response :redirect
       assert_redirected_to "/admin/typus_users/edit/#{@designer.id}"
       assert_equal "Typus user successfully updated.", flash[:notice]
-      assert_equal "designer@withafancydomain.com", @designer.reload.email
+      assert_equal "designer@withafancydomain.com", assigns(:item).email
     end
 
   end