typus 3.0.8 → 3.0.9

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

@@ -19,7 +19,7 @@ class Admin::UsersControllerTest < 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]
@@ -36,10 +36,10 @@ class Admin::UsersControllerTest < ActionController::TestCase
     end
 
     should "filter by projects" do
-      get :index, { 'projects' => @project_1.id }
+      get :index, :projects => @project_1.id
       assert_equal [@user_1], assigns(:items)
 
-      get :index, { 'projects' => @project_2.id }
+      get :index, :projects => @project_2.id
       assert_not_equal [@user_1], assigns(:items)
     end
 
@@ -61,10 +61,10 @@ class Admin::UsersControllerTest < ActionController::TestCase
 
     should "work" do
       assert_difference('@project.collaborators.count', -1) do
-        post :unrelate, { :id => @user.id,
-                          :resource => 'Project',
-                          :resource_id => @project.id,
-                          :association_name => "collaborators" }
+        post :unrelate, :id => @user.id,
+                        :resource => 'Project',
+                        :resource_id => @project.id,
+                        :association_name => "collaborators"
       end
       assert_response :redirect
       assert_redirected_to @request.env['HTTP_REFERER']
@@ -92,11 +92,11 @@ class Admin::UsersControllerTest < ActionController::TestCase
       post = User.first
       post.update_attributes(:name => "fesplugas")
 
-      get :autocomplete, { :term => "jmeiss" }
+      get :autocomplete, :term => "jmeiss"
       assert_response :success
       assert_equal 0, assigns(:items).size
 
-      get :autocomplete, { :term => "fesplugas" }
+      get :autocomplete, :term => "fesplugas"
       assert_response :success
       assert_equal 1, assigns(:items).size
     end

data/test/app/helpers/admin/list_helper_test.rb

@@ -25,6 +25,23 @@ class Admin::ListHelperTest < ActiveSupport::TestCase
       assert list_actions.empty?
     end
 
+    should "not include actions that a role cannot perform" do
+      @resource = mock
+      @resource.stubs(:name).returns("resource")
+
+      self.stubs(:link_to).returns("some_link")
+      sample_action = ["a body", {:action => :some_action}, {}]
+      self.stubs(:resources_actions).returns([sample_action] * 3)
+
+      admin_user = mock
+      admin_user.stubs(:can?).returns(true, false, true)
+      self.stubs(:admin_user).returns(admin_user)
+      self.stubs(:params).returns({:action => 'some_other_action'})
+
+      results = list_actions.split("/")
+      assert_equal 2, results.size
+    end
+
     should_eventually "return an array with our custom actions"
 
   end

data/test/app/models/admin_user_test.rb

@@ -0,0 +1,5 @@
+require "test_helper"
+
+class AdminUserTest < ActiveSupport::TestCase
+
+end

data/test/app/models/typus_user_roles_test.rb

@@ -22,6 +22,7 @@ class TypusUserRolesTest < ActiveSupport::TestCase
                   "Dog",
                   "Entry",
                   "Git",
+                  "Hit",
                   "ImageHolder",
                   "Invoice",
                   "Order",

data/test/app/models/typus_user_test.rb

@@ -8,22 +8,38 @@ class TypusUserTest < ActiveSupport::TestCase
     'test@example',
     'test@example.c',
     'testexample.com' ].each do |value|
-    should_not allow_value(value).for(:email)
+    should "not allow #{value}" do
+      assert !Factory.build(:typus_user, :email => value).valid?
+    end
   end
 
   [ 'test+filter@example.com',
     'test.filter@example.com',
     'test@example.co.uk',
     'test@example.es' ].each do |value|
-    should allow_value(value).for(:email)
+    should "allow #{value}" do
+      assert Factory.build(:typus_user, :email => value).valid?
+    end
   end
 
-  should validate_presence_of :email
-  should validate_presence_of :role
+  should "validate_presence_of :email" do
+    assert !Factory.build(:typus_user, :email => nil).valid?
+  end
 
-  should_not allow_mass_assignment_of :status
+  should "validate_presence_of :role" do
+    assert !Factory.build(:typus_user, :role => nil).valid?
+  end
 
-  should ensure_length_of(:password).is_at_least(6).is_at_most(40)
+  should "validate password length" do
+    assert !Factory.build(:typus_user, :password => "0"*5).valid?, "5"
+    assert Factory.build(:typus_user, :password => "0"*6).valid?, "6"
+    assert Factory.build(:typus_user, :password => "0"*40).valid?, "40"
+    assert !Factory.build(:typus_user, :password => "0"*41).valid?, "41"
+  end
+
+  should "not allow_mass_assignment_of :status" do
+    assert TypusUser.attr_protected.include?("status")
+  end
 
   should "verify columns" do
     expected = %w(id first_name last_name email role status salt crypted_password token preferences created_at updated_at).sort
@@ -52,6 +68,11 @@ class TypusUserTest < ActiveSupport::TestCase
       assert TypusUser.generate(options).valid?
     end
 
+    should "have set a default locale" do
+      options = { :email => 'demo@example.com', :role => 'admin' }
+      assert_equal :en, TypusUser.generate(options).locale
+    end
+
   end
 
   context "TypusUser" do
@@ -61,27 +82,27 @@ class TypusUserTest < ActiveSupport::TestCase
     end
 
     should "return email" do
-      assert_equal @typus_user.email, @typus_user.name
+      assert_equal @typus_user.email, @typus_user.to_label
     end
 
     should "return first_name" do
       @typus_user.first_name = "John"
-      assert_equal "John", @typus_user.name
+      assert_equal "John", @typus_user.to_label
     end
 
     should "return last_name" do
       @typus_user.last_name = "Locke"
-      assert_equal "Locke", @typus_user.name
+      assert_equal "Locke", @typus_user.to_label
     end
 
     should "return name when first_name and last_name are set" do
       @typus_user.first_name, @typus_user.last_name = "John", "Locke"
-      assert_equal "John Locke", @typus_user.name
+      assert_equal "John Locke", @typus_user.to_label
     end
 
     should "return name when first_name and last_name are set to nil" do
       @typus_user.first_name, @typus_user.last_name = nil
-      assert_equal @typus_user.email, @typus_user.name
+      assert_equal @typus_user.email, @typus_user.to_label
     end
 
     should "verify salt never changes" do
@@ -191,4 +212,17 @@ class TypusUserTest < ActiveSupport::TestCase
 
   end
 
+  should "owns a resource" do
+    typus_user = Factory(:typus_user)
+    resource = Factory(:post, :typus_user_id => typus_user.id)
+    assert typus_user.owns?(resource)
+  end
+
+  should "not own a resource" do
+    typus_user = Factory(:typus_user)
+    typus_user_2 = Factory(:typus_user)
+    resource = Factory(:post, :typus_user_id => typus_user_2.id)
+    assert !typus_user.owns?(resource)
+  end
+
 end

data/test/factories.rb

@@ -46,7 +46,7 @@ Factory.define :post do |f|
 end
 
 Factory.define :typus_user do |f|
-  f.sequence(:email) { |n| "admin+#{n}@example.com" }
+  f.sequence(:email) { |n| "user+#{n}@example.com" }
   f.role "admin"
   f.status true
   f.token "1A2B3C4D5E6F"

data/test/fixtures/rails_app/app/controllers/admin/hits_controller.rb

@@ -0,0 +1,40 @@
+class Admin::HitsController < Admin::ResourcesController
+
+  def index
+    @items = Hit.paginate(:per_page => 15, :page => params[:page])
+    add_resource_action("Edit", {:action => 'edit'}, {})
+    add_resource_action("Trash", {:action => "destroy"}, {:confirm => "#{Typus::I18n.t("Trash")}?", :method => 'delete'})
+  end
+
+  def new
+    @item = Hit.new
+  end
+
+  def create
+    @item = Hit.new(params[:hit])
+    if @item.save
+      flash[:notice] = Typus::I18n::t("Hit was successfully created.")
+      redirect_to :action => 'edit', :id => @item.id
+    else
+      render :action => 'new'
+    end
+  end
+
+  def edit
+    @item = Hit.find(params[:id])
+  end
+
+  def update
+    @item = Hit.find(params[:id])
+    if @item.update_attributes(params[:entry])
+      flash[:notice] = Typus::I18n::t("Hit was successfully updated.")
+      redirect_to :action => 'edit', :id => @item.id
+    else
+      render :action => "edit"
+    end
+  end
+
+  def set_scope; end
+  private :set_scope
+
+end

data/test/fixtures/rails_app/app/controllers/admin_user.rb

@@ -0,0 +1,3 @@
+class AdminUser < ActiveRecord::Base
+  has_admin
+end

data/test/fixtures/rails_app/app/models/asset.rb

@@ -9,12 +9,6 @@
 
 class Asset < ActiveRecord::Base
 
-  ##
-  # Validations
-  #
-
-  validates :caption, :presence => true
-
   ##
   # Dragonfly Stuff
   #

data/test/fixtures/rails_app/app/models/hit.rb

@@ -0,0 +1,27 @@
+require "typus/orm/mongo/class_methods"
+
+class Hit
+
+  extend Typus::Orm::Mongo::ClassMethods
+
+  if defined?(Mongoid)
+    include Mongoid::Document
+
+    field :name
+    field :description
+
+    validates_presence_of :name
+    validates_uniqueness_of :name
+  else
+    extend ActiveModel::Naming
+  end
+
+  def self.typus_fields_for(*args)
+    [[:name, :string], [:description, :text]]
+  end
+
+  def self.model_fields
+    [[:name, :string], [:description, :text]]
+  end
+
+end

data/test/fixtures/rails_app/app/views/admin/hits/_edit.html.erb

@@ -0,0 +1,7 @@
+<div class="notice">
+  This is the MongoDB document.
+</div>
+
+<pre>
+<%= @item.inspect %>
+</pre>

data/test/fixtures/rails_app/app/views/admin/hits/_index.html.erb

@@ -0,0 +1,3 @@
+<div class="notice">
+  This model uses the document-oriented database <strong>MongoDB</strong>.
+</div>

data/test/fixtures/rails_app/app/views/admin/hits/index.html.erb

@@ -0,0 +1,28 @@
+<%
+  page_title = @resource.model_name.human.pluralize
+  title(page_title)
+%>
+
+<% content_for :sidebar, build_sidebar %>
+
+<h2>
+  <%= page_title %>
+  <small><%= list_actions %></small>
+</h2>
+
+<%= display_flash_message %>
+
+<%= render 'index' %>
+
+<ul class="predefined_filters">
+  <% predefined_filters.each do |filter, action, scope| %>
+    <li><%= link_to Typus::I18n.t(filter), params.dup.cleanup.merge(:action => action) %> (<%= @resource.send(scope).count %>)</li>
+  <% end %>
+</ul>
+
+<% if @items.any? -%>
+  <%= build_list(@resource, fields, @items) %>
+  <%= will_paginate(@items, Typus.pagination) %>
+<% else %>
+  <p><%= Typus::I18n.t("No %{resources} found.", :resources => @resource.model_name.human.downcase.pluralize) %></p>
+<% end %>

data/test/fixtures/rails_app/config/boot.rb

@@ -1,13 +1,6 @@
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../../../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/test/fixtures/rails_app/config/deploy.rb

@@ -9,7 +9,7 @@ set :repository, "git://github.com/fesplugas/typus.git"
 set :deploy_via, :remote_cache
 set :keep_releases, 2
 
-# Override default :bundle_flags because I don't provice a Gemfile.lock.
+# Override default `:bundle_flags` because I don't provide a Gemfile.lock.
 set :bundle_flags, "--quiet"
 
 set :domain, "demo.typuscms.com"

data/test/fixtures/rails_app/config/mongoid.yml

@@ -0,0 +1,20 @@
+defaults: &defaults
+  host: localhost
+  # slaves:
+  #   - host: slave1.local
+  #     port: 27018
+  #   - host: slave2.local
+  #     port: 27019
+
+development:
+  <<: *defaults
+  database: rails_app_development
+
+test:
+  <<: *defaults
+  database: rails_app_test
+
+# set these environment variables on your prod server
+production:
+  <<: *defaults
+  database: rails_app_production

data/test/fixtures/rails_app/config/typus/crud_extended.yml

@@ -2,6 +2,8 @@ Asset:
   fields:
     default: caption, dragonfly, dragonfly_required
     special: caption, dragonfly, dragonfly_required, original_file_name
+    form: caption, dragonfly, dragonfly_required, original_file_name
+    new: dragonfly_required
   application: CRUD Extended
 
 Category:

data/test/fixtures/rails_app/config/typus/mongo_db.yml

@@ -0,0 +1,4 @@
+Hit:
+  fields:
+    default: name, description
+  application: MongoDB

data/test/fixtures/rails_app/config/typus/mongo_db_roles.yml

@@ -0,0 +1,2 @@
+admin:
+  Hit: all

data/test/fixtures/rails_app/db/schema.rb

@@ -2,6 +2,17 @@ ActiveRecord::Migration.verbose = false
 
 ActiveRecord::Schema.define do
 
+  create_table :admin_users, :force => true do |t|
+    t.string :first_name
+    t.string :last_name
+    t.string :role, :null => false
+    t.string :email, :null => false
+    t.string :password_digest, :null => false
+    t.string :preferences
+    t.boolean :status, :default => false
+    t.timestamps
+  end
+
   create_table :articles, :force => true do |t|
     t.string :title
     t.text :body

data/test/lib/support/fake_user_test.rb

@@ -56,4 +56,8 @@ class FakeUserTest < ActiveSupport::TestCase
     assert !@fake_user.respond_to?(:resources)
   end
 
+  should "always be the owner of a resource" do
+    assert @fake_user.owns?('a')
+  end
+
 end

data/test/lib/support/string_test.rb

@@ -49,24 +49,6 @@ class StringTest < ActiveSupport::TestCase
 
   end
 
-  context "action_mapper" do
-
-    should "return list for index" do
-      assert_equal :list, 'index'.action_mapper
-    end
-
-    should "return form for new, create, edit and update" do
-      %w(new create edit update).each do |action|
-        assert_equal :form, action.action_mapper
-      end
-    end
-
-    should "return the same action for everything else" do
-      assert_equal 'undefined', 'undefined'.action_mapper
-    end
-
-  end
-
   context "acl_action_mapper" do
 
     should "return create" do