rad_kit 0.0.8 → 0.0.9

data/spec/controller/authorization_spec.rb

@@ -1,148 +1,148 @@
 require 'spec_helper'
 
-describe "Authorizations" do    
+describe "Authorizations" do
   with_controllers
-  
+
   isolate :config
-    
-  before :all do     
+
+  before :all do
     @permissions = {
       'call_controller_level' => [],
       'call_business_logic_level' => [],
       'call_with_owner' => []
     }
-    
+
     class ::AuthorizationController
       inherit Rad::Controller::Http
-      
+
       inherit Rad::Controller::Authorized
-    
+
       require_permission :call_controller_level, only: :controller_level
-    
+
       def unprotected
         render_ok
       end
-    
+
       def controller_level
         render_ok
       end
-          
+
       def business_logic_level
         require_permission :call_business_logic_level
         render_ok
       end
-      
+
       def with_owner
         require_permission :call_with_owner, owned_object
         render_ok
       end
-      
+
       def with_owner_controller_level
         render_ok
       end
       require_permission :call_with_owner, only: :with_owner_controller_level do
         owned_object
       end
-      
-      protected 
+
+      protected
         def owned_object
           @@owned_object
         end
-        
+
         def self.owned_object= o
           @@owned_object = o
         end
     end
-    
+
     rad.router.configure do |c|
-      c.resource :authorization_controllers, class_name: 'AuthorizationController'     
+      c.resource :authorization_controllers, class_name: 'AuthorizationController'
     end
-    
+
     I18n.locale = :en
-  end  
-  
+  end
+
   after :all do
     remove_constants %w(AuthorizationController)
   end
-  
+
   before do
     AuthorizationController.owned_object = nil
-    
+
     rad.config.permissions = @permissions
-    
+
     @user = Models::User.new
     rad.user = @user
   end
-  
+
   def raise_authorization_error
     raise_error(UserError, /Access Denied/)
   end
-  
+
   it "should allow to call unprotected methods" do
     call('/authorization_controllers/unprotected')
     response.body.should == "ok"
   end
-  
-  it "should allow declarative authorization at controller level" do    
+
+  it "should allow declarative authorization at controller level" do
     @user.stub!(:can?).and_return(false)
     lambda{
       call '/authorization_controllers/controller_level'
     }.should raise_authorization_error
     # response.should be_redirect
-  
+
     @user.stub!(:can?).and_return(true)
     call '/authorization_controllers/controller_level'
     response.body.should == "ok"
   end
-  
-  it "should allow declarative authorization at business logic level" do    
+
+  it "should allow declarative authorization at business logic level" do
     @user.stub!(:can?).and_return(false)
     lambda{
       call '/authorization_controllers/business_logic_level'
     }.should raise_authorization_error
     # response.should be_redirect
-      
+
     @user.stub!(:can?).and_return(true)
     call '/authorization_controllers/business_logic_level'
     response.body.should == "ok"
   end
-  
+
   it "should use owner if provided" do
     @user.stub!(:can?){false}
     lambda{
       call '/authorization_controllers/with_owner'
     }.should raise_authorization_error
     # response.should be_redirect
-  
-    
+
+
     o = Object.new
     o.stub!(:owner_name){@user.name}
-    AuthorizationController.owned_object = o 
-    
-    @user.stub!(:can?) do |operation, object|       
+    AuthorizationController.owned_object = o
+
+    @user.stub!(:can?) do |operation, object|
       object and object.owner_name == @user.name
     end
-    
+
     call '/authorization_controllers/with_owner'
     response.body.should == "ok"
   end
-  
-  it "should use owner if provided (action level)" do    
+
+  it "should use owner if provided (action level)" do
     @user.stub!(:can?){false}
     lambda{
       call '/authorization_controllers/with_owner_controller_level'
     }.should raise_authorization_error
     # response.should be_redirect
-    
-    
+
+
     o = Object.new
     o.stub!(:owner_name){@user.name}
     AuthorizationController.owned_object = o
-  
-    @user.stub!(:can?) do |operation, object|       
+
+    @user.stub!(:can?) do |operation, object|
       object and object.owner_name == @user.name
     end
-    
+
     call '/authorization_controllers/with_owner_controller_level'
     response.body.should == "ok"
   end

data/spec/controller/captcha_spec.rb

@@ -4,63 +4,63 @@ describe "Captcha" do
   before :all do
     class TheController
       inherit Rad::Controller::Http, Rad::Controller::Captcha
-      
+
       def action
         render inline: 'ok'
       end
-    end      
-  end     
+    end
+  end
   after(:all){remove_constants :TheController}
-  
+
   before do
     rad.captcha.stub!(:enabled).and_return(true)
 
     @request = Rad::Http::Request.stub
     @request.stub!(:from_browser?).and_return(true)
-    
+
     @params = Rad::Conveyors::Params.new
-    
+
     @controller = TheController.new
     @controller.stub!(:request).and_return(@request)
     @controller.stub!(:params).and_return(@params)
   end
-  
+
   it "should allow get for anyone" do
     @request.stub!(:get?).and_return(true)
-    
+
     rad.user = Factory.build :anonymous
     @controller.call(:action).should == 'ok'
-    
+
     rad.user = Factory.build :registered
     @controller.call(:action).should == 'ok'
   end
-  
+
   it "shouldn't allow non-get for anonymous" do
     @request.stub!(:get?).and_return(false)
-    
+
     rad.user = Factory.build :anonymous
     -> {@controller.call(:action)}.should raise_error(UserError)
-    
+
     rad.user = Factory.build :registered
     @controller.call(:action).should == 'ok'
   end
-  
+
   it "should display captcha form for anonymous if format is :js" do
-    @request.stub!(:get?).and_return(false)    
+    @request.stub!(:get?).and_return(false)
     @params.format = 'js'
     rad.captcha.stub!(:verify).and_return(false)
     rad.user = Factory.build :anonymous
     @controller.stub!(:render).and_return('form')
-    
+
     @controller.call(:action).should == 'form'
   end
-  
+
   it "should allow anonymous access if it solved captcha" do
-    @request.stub!(:get?).and_return(false) 
+    @request.stub!(:get?).and_return(false)
     @params.format = 'js'
     rad.captcha.stub!(:verify).and_return(true)
     rad.user = Factory.build :anonymous
-    
+
     @controller.call(:action).should == 'ok'
   end
 end

data/spec/controller/comments_spec.rb

@@ -4,51 +4,53 @@ describe "Comments" do
   with_controllers
   set_controller Controllers::Comments
   login_as :user
-    
+
   before do
     @item = Factory.create :item
   end
-  
+
   def create_comment original_text = 'text'
     Factory.create :comment, item: @item, owner: @user
   end
-  
+
   it "should display new dialog" do
     call :new, format: 'js', item_id: @item.to_param
     response.should be_ok
   end
-  
+
   it "should create Comment" do
     comment_attributes = Factory.attributes_for :comment
     pcall :create, format: 'js', item_id: @item.to_param, model: comment_attributes
     response.should be_ok
-    
-    Models::Comment.count.should == 1
-    comment = Models::Comment.first
+
+    Models::Comment.count(_class: 'Models::Comment').should == 1
+    comment = Models::Comment.first(_class: 'Models::Comment')
+
     comment.original_text.should == comment_attributes[:original_text]
-    comment.owner.should == @user
-    comment.item.should == @item
+
+    comment.owner.name.should == @user.name
+    comment.item.name.should == @item.name
   end
-  
+
   it "should display edit dialog" do
     comment = create_comment
     call :edit, format: 'js', id: comment.to_param
     response.should be_ok
   end
-  
+
   it "should update Comment" do
     comment = create_comment
     new_attributes = {original_text: 'new text'}
     pcall :update, format: 'js', id: comment.to_param, model: new_attributes
     response.should be_ok
-    
+
     comment.reload
     comment.original_text.should == 'new text'
   end
-  
+
   it "should delete Comment" do
     comment = create_comment
     pcall :destroy, format: 'js', id: comment.to_param
-    Models::Comment.count.should == 0
+    Models::Comment.count(_class: 'Models::Comment').should == 0
   end
 end

data/spec/controller/items_spec.rb

@@ -3,43 +3,42 @@ require 'spec_helper'
 describe "Items" do
   with_controllers
   login_as :manager, name: 'auser'
-  
+
   describe "Basic" do
     set_controller Controllers::Items
-    
-    it "should update layout" do      
+
+    it "should update layout" do
       @item = Factory.create :item
       @item.layout.should == nil
-    
-      pcall :layout, id: @item.to_param, value: 'home', format: 'js'      
+
+      pcall :layout, id: @item.to_param, value: 'home', format: 'js'
       response.should be_ok
-    
+
       @item.reload
       @item.layout.should == 'home'
     end
-  
+
     it 'viewers, add_roles' do
       @item = Factory.create :item
       @item.viewers.should == %w{manager user:auser}
       @item.owner_name.should == @user.name
-    
+
       pcall :viewers, id: @item.to_param, add_roles: 'user', format: 'js'
-      response.should be_ok      
-    
+      response.should be_ok
+
       @item.reload
       @item.viewers.should == %w{manager member user user:auser}
     end
-    
+
     it "should redirect to /items if no default_url specified" do
       call :redirect
       response.should redirect_to(rad.router.default_url)
     end
-    
-    it "should display :all"
-    # do
-    #   call :all
-    #   response.should be_ok
-    # end
+
+    it "should display :all" do
+      call :all
+      response.should be_ok
+    end
 
   end
 end

data/spec/i18n/i18n_spec.rb

@@ -6,23 +6,23 @@ describe 'I18n' do
   before :all do
     rad.web
     rad.reset :conveyors
-    
+
     I18n.load_path += Dir["#{spec_dir}/locales/*/*.{rb,yml}"]
   end
-  
+
   def t *args
     I18n.t *args
   end
-  
+
   it "basic" do
     I18n.locale = 'en'
     t(:name).should == "Name"
     t(:name).is_a?(String).should be_true
-    
+
     I18n.locale = 'ru'
     t(:name).should == "Имя"
   end
-  
+
   it "pluggable pluralization" do
     I18n.locale = 'ru'
     t(:comments_count, count: 1).should == "1 комментарий"

data/spec/misc/kit_text_utils_spec.rb

@@ -1,21 +1,21 @@
 require "spec_helper"
 
 describe "TextUtils with Kit extensions" do
-  it "should truncate" do    
+  it "should truncate" do
     TextUtils.truncate('lorem ipsum', 10).should == 'lorem ...'
   end
-  
+
   it "should process markdown (should qualify markdown format automatically)" do
     TextUtils.markup('lorem **ipsum**').should == '<p>lorem <strong>ipsum</strong></p>'
   end
-  
+
   it "should process html (should qualify html format automatically)" do
     TextUtils.markup('<p>lorem **ipsum**</p>').should == '<p>lorem **ipsum**</p>'
   end
-  
+
   it "code highlight" do
     rad.config.stub!(:use_code_highlighter).and_return(true)
-    
+
     markdown = <<MARKDOWN
 code