rad_kit 0.0.8 → 0.0.9

data/spec/misc/prepare_model_spec.rb

@@ -3,29 +3,29 @@ require "spec_helper"
 describe "User Error" do
   isolate :conveyors, :router, before: :all
 
-  before :all do    
+  before :all do
     rad.delete :conveyors
     rad.conveyors.web do |web|
       web.use Rad::Controller::Processors::ControllerCaller
     end
-    
+
     class ::SomeModel
       def self.find! id
         id.should == 'some id'
         SomeModel.new
       end
     end
-  end  
+  end
   after :all do
     remove_constants %w(SomeModel ControllerSpec)
   end
-  
+
   it "user error" do
     class ::ControllerSpec
       inherit Rad::Controller::Http
-      
+
       prepare_model SomeModel, id: :some_model, variable: 'some_model'
-      
+
       def action
         @some_model.should_not == nil
         render inline: 'ok'

data/spec/misc/user_error_spec.rb

@@ -1,27 +1,27 @@
 require "spec_helper"
 
-describe "User Error" do    
+describe "User Error" do
   isolate :conveyors, :router, before: :all
-  
+
   before(:all) do
     rad.delete :conveyors
     rad.conveyors.web do |web|
       web.use Rad::Controller::Processors::ControllerCaller
     end
   end
-  
+
   after :all do
     remove_constants %w(UserErrorSpec)
   end
-  
+
   it "user error" do
     class ::UserErrorSpec
       inherit Rad::Controller::Http
-      
+
       def action
         raise_user_error "some error"
-      end      
-      
+      end
+
       protected
         def catch_user_error
           begin
@@ -32,7 +32,7 @@ describe "User Error" do
         end
         around :catch_user_error
     end
-    
+
     ccall(UserErrorSpec, :action).should == "Catched some error"
   end
 end

data/spec/models/{attachments_uploader_helper_spec.rb → attachments_helper_spec.rb}

@@ -1,50 +1,46 @@
 require 'spec_helper'
 
-describe "Attachments" do  
-  with_tmp_spec_dir
-  with_mongoid
-  with_files
+describe "Attachments" do
+  with_models
 
   before :all do
-    class TheFileUploader < Models::FileUploader
+    class TheBaseFile < Models::BaseFile
     end
-    
+
     class TheFile
-      include Mongoid::Document
-      
-      embedded_in :post, class_name: 'ThePost'
-      mount_uploader :file, TheFileUploader
-    end        
-  
+      inherit Mongo::Model, Mongo::Model::FileModel
+
+      mount_file :file, TheBaseFile
+    end
+
     class ThePost
-      include Mongoid::Document
+      inherit Mongo::Model
+
+      def files; @files ||= [] end
+      mount_attachments(:files, :file){TheFile.new}
 
-      embeds_many :files, class_name: 'TheFile'                
-      mount_embedded_uploader :files, :file
-      mount_attachments_uploader :files, :file
-      
       def sorted_files
-        files.sort{|a, b| a.file.url <=> b.file.url}
+        files.sort{|a, b| a.file.file.name <=> b.file.file.name}
       end
-    end                
-  end  
-  after(:all){remove_constants :ThePost, :TheImage, :TheImageUploader}  
-  
+    end
+  end
+  after(:all){remove_constants :ThePost, :TheFile, :TheBaseFile}
+
   before do
     @a = File.open("#{spec_dir}/v1/a.txt")
     @b = File.open("#{spec_dir}/v1/b.txt")
     @a_v2 = File.open("#{spec_dir}/v2/a.txt")
   end
-  after do 
+  after do
     @a.close if @a
     @b.close if @b
     @a_v2.close if @a_v2
   end
-  
+
   def post_with_two_files
     params = {
       files_as_attachments: [@a, @b]
-    }    
+    }
 
     post = ThePost.new params
     post.save!
@@ -52,56 +48,56 @@ describe "Attachments" do
     post.files.size.should == 2
     post
   end
-  
+
   it "should add files" do
     post = post_with_two_files
-    
+
     post.files.size.should == 2
     a, b = post.sorted_files
-    a.file.path.should =~ /\/a\.txt/
-    b.file.path.should =~ /\/b\.txt/
+    a.file.file.path.should =~ /\/a\.txt/
+    b.file.file.path.should =~ /\/b\.txt/
   end
-  
+
   it "should remove files" do
     post = post_with_two_files
     a, b = post.sorted_files
-    File.should exist(b.file.path)
-    
+    File.should exist(file_model_storage.path + b.file.file.path)
+
     params = {
       files_as_attachments: ['a.txt']
-    }    
-    post.update_attributes(params).should be_true
+    }
+    post.set(params).save!
     post.reload
-    
+
     post.files.size.should == 1
-    post.files.first.file.path.should =~ /\/a\.txt/
-    
+    post.files.first.file.file.path.should =~ /\/a\.txt/
+
     # should also remove physical file
-    File.should_not exist(b.file.path)
+    File.should_not exist(file_model_storage.path + b.file.file.path)
   end
-  
+
   it "should update files" do
     post = post_with_two_files
-    
+
     params = {
       files_as_attachments: [@a_v2, 'b.txt']
-    }    
-    post.update_attributes(params).should be_true
+    }
+
+    post.set(params).save!
     post.reload
-    
-    post.files.size.should == 2
+
     a, b = post.sorted_files
-    a.file.path.should =~ /\/a\.txt/
-    File.read(a.file.path).should == 'a v2'
-    b.file.path.should =~ /\/b\.txt/
+    a.file.file.path.should =~ /\/a\.txt/
+    File.read(file_model_storage.path + a.file.file.path).should == 'a v2'
+    b.file.file.path.should =~ /\/b\.txt/
   end
-  
+
   it "should provide :files_as_attachments getter" do
     post = post_with_two_files
     a, b = post.sorted_files
-      
+
     post.files_as_attachments.should == [
-      {name: 'a.txt', url: a.file.url}, 
+      {name: 'a.txt', url: a.file.url},
       {name: 'b.txt', url: b.file.url}
     ]
   end

data/spec/models/attachments_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
-describe "Attachments" do  
-  with_tmp_spec_dir
+describe "Attachments" do
   with_models
-  with_files
   login_as :user
 
   before do
@@ -12,13 +10,12 @@ describe "Attachments" do
   after do
     @a.close if @a
   end
-  
+
   it "smoke test" do
     item = Factory.create :item, name: 'my note', attachments_as_attachments: [@a]
     item.reload
-    
+
     item.attachments.size.should == 1
-    # item.attachments.first.file.path.should =~ /\/my note\/a\.txt/
-    item.attachments.first.file.path.should =~ /\/#{item.id}\/a\.txt/
+    item.attachments.first.file.file.path.should =~ /\/#{item._id}\/a\.txt/
   end
 end

data/spec/models/authorization_spec.rb

@@ -1,30 +1,30 @@
 require 'spec_helper'
 
-describe "Authorization" do  
-  with_models  
-  
+describe "Authorization" do
+  with_models
+
   describe "Roles" do
-    it "user should have it's name in roles" do      
+    it "user should have its name in roles" do
       user = Factory.build :user, name: 'some_name'
       user.roles.should include('user:some_name')
     end
-    
+
     it ":anonymous, :registered, :user roles" do
       anonymous = Factory.build :anonymous
       anonymous.roles.should == %w{anonymous user user:anonymous}
-          
+
       user = Factory.build :user, name: 'john'
       user.roles.should == %w{registered user user:john}
-          
+
       admin = Factory.build :admin, name: 'john'
       admin.roles.should == %w{admin manager member registered user user:john}
     end
-      
+
     it "all managers should also have the member role, always" do
       user = Factory.build :manager, name: 'john'
       user.roles.should == %w{manager member registered user user:john}
     end
-      
+
     it "handy methods" do
       u = Factory.build :anonymous
       u.roles.anonymous?.should be_true
@@ -32,7 +32,7 @@ describe "Authorization" do
       u.roles.has?(:anonymous).should be_true
       u.should have_role(:anonymous)
     end
-      
+
     it "add_role" do
       u = Factory.build :member, name: 'john'
       u.should_not have_role('manager')
@@ -40,8 +40,8 @@ describe "Authorization" do
       u.save!
       u.reload
       u.should have_role('manager')
-    end    
-    
+    end
+
     it "remove_role" do
       u = Factory.build :manager, name: 'john'
       u.remove_role :member
@@ -50,14 +50,14 @@ describe "Authorization" do
       u.should_not have_role('manager')
       u.should_not have_role('member')
     end
-    
+
     it "should add also all lover roles" do
       u = Factory.build :user, name: 'john'
       u.roles.should_not include('member')
       u.add_role :manager
       u.roles.should include('member')
     end
-    
+
     it "special case, admin role" do
       u = Factory.build :user, name: 'john'
       u.should_not have_role('manager')
@@ -67,7 +67,7 @@ describe "Authorization" do
       u.should have_role('admin')
       u.should have_role('manager')
     end
-    
+
     it "major_roles" do
       u = Factory.build :member, name: 'john'
       u.add_role :director

data/spec/models/authorized_object_spec.rb

@@ -1,110 +1,110 @@
 require 'spec_helper'
 
-describe "Authorized Object" do  
+describe "Authorized Object" do
   with_models
-  
-  before :all do        
+
+  before :all do
     class ::AModel
-      include Mongoid::Document
-      include Mongoid::AuthorizedObject
-    end    
-  end  
+      inherit Mongo::Model
+      inherit Models::AuthorizedObject
+    end
+  end
   after(:all){remove_constants :AModel}
-  
+
   def custom_permissions= value
-    Mongoid::Authorized.custom_permissions = value
+    Models::Authorized.custom_permissions = value
   end
-    
+
   after{self.custom_permissions = {}}
-  
+
   describe "Owner, Viewers, Collaborators" do
-    before do   
+    before do
       rad.delete :user
       @user = Factory.create :user, name: 'auser'
     end
-    
+
     it "should be abel to create objects (from error)" do
       rad.user = @user
       o = AModel.new
       o.save!
-    end 
-      
+    end
+
     it "should by default set current user_name as owner_name if there is current user" do
       o = AModel.new
       o.owner_name.should be_nil
-    
+
       rad.user = @user
       o = AModel.new
       o.owner_name.should == 'auser'
     end
-      
+
     it "owner" do
       o = AModel.new
       o.owner = @user
-      o.owner_name.should == @user.name 
-      o.viewers.should == %w{manager user:auser}       
+      o.owner_name.should == @user.name
+      o.viewers.should == %w{manager user:auser}
       o.should be_valid
     end
-      
+
     it 'viewers' do
       o = AModel.new
       o.owner = @user
       o.add_viewer :user
       o.viewers.should == %w{manager member user user:auser}
       o.should be_valid
-    
+
       o.remove_viewer :user
       o.viewers.should == %w{manager user:auser}
       o.should be_valid
-          
+
       o.add_viewer :member
       o.viewers.should == %w{manager member user:auser}
       o.should be_valid
-          
+
       o.add_viewer :user
       o.viewers.should == %w{manager member user user:auser}
       o.should be_valid
     end
-    
+
     it "duplicate roles (from error)" do
       o = AModel.new
       o.owner = @user
       o.save!
-      
+
       o = AModel.first # don't use reload, it willn't catch this error
       o.viewers.should == %w{manager user:auser}
     end
-  
+
     it "collaborators" do
       o = AModel.new
       o.owner = @user
       o.add_collaborator :member
       o.collaborators.should == %w{member}
       o.should be_valid
-      
+
       o.add_collaborator :director
       o.collaborators.should == %w{member director}
       o.should be_valid
-      
+
       o.remove_collaborator :member
       o.collaborators.should == %w{director}
       o.should be_valid
     end
-    
+
     it "normalized_collaborators" do
       o = AModel.new
       o.owner = @user
       o.add_collaborator :member
       o.normalized_collaborators.should == %w{manager member user:auser}
     end
-    
+
     it "anonymous should never be collaborator (from error)" do
       @user = Factory.build :anonymous
       o = AModel.new
       o.owner = @user
       o.normalized_collaborators.should == []
     end
-    
+
     it "viewers and collaborators dependance" do
       o = AModel.new
       o.owner = @user
@@ -112,16 +112,16 @@ describe "Authorized Object" do
       o.collaborators.should == %w{user}
       o.viewers.should == %w{manager member user user:auser}
       o.should be_valid
-      
+
       o.remove_viewer :member
       o.viewers.should == %w{manager user user:auser}
       o.collaborators.should == %w{user}
-      
+
       o.remove_viewer :user
       o.viewers.should == %w{manager user:auser}
       o.collaborators.should == %w{}
     end
-    
+
     it "major viewers" do
       o = AModel.new
       o.owner = @user
@@ -130,31 +130,31 @@ describe "Authorized Object" do
       o.viewers.should == %w{director manager member user:auser}
       o.minor_viewers.should == %w{director member user:auser}
     end
-    
+
     it "collaborators should be able to change object (from error)" do
       col = Factory.create :member, name: 'collaborator'
-      
+
       o = AModel.new
-      o.owner = @user      
+      o.owner = @user
       col.can?(:update, o).should be_false
-      
+
       o.add_collaborator :member
-      o.clear_cache
+      o._cache.clear
       col.can?(:update, o).should be_true
       @user.can?(:update, o).should be_true
-      
+
       o.save!
-      o = AModel.find o.id
+      o = AModel.by_id o._id
       col.can?(:update, o).should be_true
       @user.can?(:update, o).should be_true
     end
-    
+
     it 'should allow to create public or private (by default) objects'
   end
-  
+
   describe "Permissions" do
     describe "General" do
-      before do        
+      before do
         self.custom_permissions = {'manage' => %w{manager}}
       end
 
@@ -162,38 +162,38 @@ describe "Authorized Object" do
         u = Models::User.new
         u.can?(:manage, AModel)
       end
-    
+
       it 'permissions' do
         u = Factory.create :user
         u.can?(:manage, AModel).should be_false
-      
-        u = Factory.create :manager        
+
+        u = Factory.create :manager
         u.can?(:manage, AModel).should be_true
-      end    
+      end
     end
-    
+
     describe "as Owner" do
       before do
         self.custom_permissions = {'manage' => %w{manager owner}}
-        
-        @user = Factory.create :user        
-        
-        @object = AModel.new        
+
+        @user = Factory.create :user
+
+        @object = AModel.new
         @owned_object = AModel.new
         @owned_object.owner = @user
       end
-      
-      it "owner?" do                
+
+      it "owner?" do
         @user.should_not be_owner(@object)
-        @user.should be_owner(@owned_object)        
+        @user.should be_owner(@owned_object)
       end
-      
+
       it "anonymous should never be owner of anything" do
         @user = Factory.build :anonymous
-        
+
         @owned_object = AModel.new
         @owned_object.owner = @user
-        
+
         @user.should_not be_owner(@owned_object)
       end
 
@@ -202,60 +202,60 @@ describe "Authorized Object" do
         @user.can?(:manage, @owned_object).should be_true
       end
     end
-    
+
     describe "Special :view permission" do
-      before do 
+      before do
         # managers can see anything, always, it's hardcoded
         self.custom_permissions = {'view' => %w{manager}}
       end
-  
+
       it "user (public) viewers" do
         user = Factory.create :user
-  
+
         o = AModel.new
         o.stub!(:viewers){%w{user}}
-  
+
         user.can?(:view, o).should be_true
       end
-  
+
       it "member viewers" do
         self.custom_permissions = {'view' => []}
-  
+
         user = Factory.create :user
         member = Factory.create :member
         manager = Factory.create :manager
-        
+
         o = AModel.new
         o.stub!(:viewers).and_return(%w{member manager})
-  
+
         user.can?(:view, o).should be_false
         member.can?(:view, o).should be_true
         manager.can?(:view, o).should be_true
       end
-  
+
       it "owner (private) viewers" do
         self.custom_permissions = {'view' => []}
-  
+
         owner = Factory.create :user, name: "aname"
         user = Factory.create :user
         member = Factory.create :member
         manager = Factory.create :manager
-  
+
         o = AModel.new
         o.stub!(:owner_name){owner.name}
         o.stub!(:viewers){%w{user:aname manager}}
-  
+
         owner.can?(:view, o).should be_true
         user.can?(:view, o).should be_false
         member.can?(:view, o).should be_false
         manager.can?(:view, o).should be_true
       end
-  
+
       it "should correct works with non authorized objects (from error)" do
-        user = Factory.create :user    
+        user = Factory.create :user
         user.can?(:view, Object.new).should be_false
       end
     end
-    
+
   end
 end