typus 1.0.0.pre → 1.0.0.pre2

data/test/fixtures/rails_app/tmp/export-posts-20100913124638.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913124717.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913125425.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913125626.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913125651.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913125741.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913125827.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913125856.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913125928.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913130119.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913130159.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913130319.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913130339.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913131400.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913131915.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913132022.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913132844.csv

@@ -0,0 +1,2 @@
+title;status
+Post;published

data/test/lib/typus/active_record_test.rb

@@ -208,14 +208,16 @@ class ActiveRecordTest < ActiveSupport::TestCase
 
   context "Typus date format" do
 
-    should "verify typus_date_format accepts strings and symbols" do
+    should "verify typus_date_format accepts strings" do
       assert_equal :db, Post.typus_date_format("unknown")
+    end
+
+    should "verify typus_date_format accepts symbols" do
       assert_equal :db, Post.typus_date_format(:unknown)
     end
 
     should "return typus_date_formats for Post" do
       assert_equal :db, Post.typus_date_format
-      assert_equal :post_short, Post.typus_date_format("created_at")
       assert_equal :post_short, Post.typus_date_format(:created_at)
     end
 
@@ -223,8 +225,11 @@ class ActiveRecordTest < ActiveSupport::TestCase
 
   context "Typus defaults for" do
 
-    should "verify typus_defaults_for on Model accepts strings and symbols" do
+    should "verify typus_defaults_for on Model accepts strings" do
       assert_equal %w( title ), Post.typus_defaults_for("search")
+    end
+
+    should "verify typus_defaults_for on Model accepts symbols" do
       assert_equal %w( title ), Post.typus_defaults_for(:search)
     end
 
@@ -250,8 +255,36 @@ class ActiveRecordTest < ActiveSupport::TestCase
 
   context "Build conditions" do
 
+    should "generate conditions for id" do
+      Post.stubs(:typus_defaults_for).with(:search).returns(["id"])
+
+      params = { :search => '1' }
+      expected = "(id LIKE '%1%')"
+
+      assert_equal expected, Post.build_conditions(params).first
+    end
+
+    should "generate conditions for fields starting with equal" do
+      Post.stubs(:typus_defaults_for).with(:search).returns(["=id"])
+
+      params = { :search => '1' }
+      expected = "(id LIKE '1')"
+
+      assert_equal expected, Post.build_conditions(params).first
+    end
+
+    should "generate conditions for fields starting with ^" do
+      Post.stubs(:typus_defaults_for).with(:search).returns(["^id"])
+
+      params = { :search => '1' }
+      expected = "(id LIKE '1%')"
+
+      assert_equal expected, Post.build_conditions(params).first
+    end
+
     should "return_sql_conditions_on_search_for_typus_user" do
       expected = "(role LIKE '%francesc%' OR last_name LIKE '%francesc%' OR email LIKE '%francesc%' OR first_name LIKE '%francesc%')"
+
       params = { :search => "francesc" }
       assert_equal expected, TypusUser.build_conditions(params).first
       params = { :search => "Francesc" }
@@ -259,7 +292,6 @@ class ActiveRecordTest < ActiveSupport::TestCase
     end
 
     should "return_sql_conditions_on_search_and_filter_for_typus_user" do
-
       case ENV["DB"]
       when /mysql/
         boolean_true = "(`typus_users`.`status` = 1)"
@@ -270,15 +302,14 @@ class ActiveRecordTest < ActiveSupport::TestCase
       end
 
       expected = "((role LIKE '%francesc%' OR last_name LIKE '%francesc%' OR email LIKE '%francesc%' OR first_name LIKE '%francesc%')) AND #{boolean_true}"
+
       params = { :search => "francesc", :status => "true" }
       assert_equal expected, TypusUser.build_conditions(params).first
       params = { :search => "francesc", :status => "false" }
       assert_match /#{boolean_false}/, TypusUser.build_conditions(params).first
-
     end
 
     should "return_sql_conditions_on_filtering_typus_users_by_status" do
-
       case ENV["DB"]
       when /mysql/
         boolean_true = "(`typus_users`.`status` = 1)"
@@ -292,27 +323,26 @@ class ActiveRecordTest < ActiveSupport::TestCase
       assert_equal boolean_true, TypusUser.build_conditions(params).first
       params = { :status => "false" }
       assert_equal boolean_false, TypusUser.build_conditions(params).first
-
     end
 
     should "return_sql_conditions_on_filtering_typus_users_by_created_at today" do
       expected = case ENV["DB"]
                  when /postgresql/
-                   "(created_at BETWEEN E'#{Time.new.midnight.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                   "(created_at BETWEEN E'#{Time.zone.now.beginning_of_day.to_s(:db)}' AND E'#{Time.zone.now.beginning_of_day.tomorrow.to_s(:db)}')"
                  else
-                   "(created_at BETWEEN '#{Time.new.midnight.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                   "(created_at BETWEEN '#{Time.zone.now.beginning_of_day.to_s(:db)}' AND '#{Time.zone.now.beginning_of_day.tomorrow.to_s(:db)}')"
                  end
-      params = { :created_at => "today" }
 
+      params = { :created_at => "today" }
       assert_equal expected, TypusUser.build_conditions(params).first
     end
 
     should "return_sql_conditions_on_filtering_typus_users_by_created_at last_few_days" do
       expected = case ENV["DB"]
                  when /postgresql/
-                   "(created_at BETWEEN E'#{3.days.ago.midnight.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                   "(created_at BETWEEN E'#{3.days.ago.beginning_of_day.to_s(:db)}' AND E'#{Time.zone.now.beginning_of_day.tomorrow.to_s(:db)}')"
                  else
-                   "(created_at BETWEEN '#{3.days.ago.midnight.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                   "(created_at BETWEEN '#{3.days.ago.beginning_of_day.to_s(:db)}' AND '#{Time.zone.now.beginning_of_day.tomorrow.to_s(:db)}')"
                  end
 
       params = { :created_at => "last_few_days" }
@@ -322,9 +352,9 @@ class ActiveRecordTest < ActiveSupport::TestCase
     should "return_sql_conditions_on_filtering_typus_users_by_created_at last_7_days" do
       expected = case ENV["DB"]
                  when /postgresql/
-                   "(created_at BETWEEN E'#{6.days.ago.midnight.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                   "(created_at BETWEEN E'#{6.days.ago.beginning_of_day.to_s(:db)}' AND E'#{Time.zone.now.beginning_of_day.tomorrow.to_s(:db)}')"
                  else
-                   "(created_at BETWEEN '#{6.days.ago.midnight.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                   "(created_at BETWEEN '#{6.days.ago.beginning_of_day.to_s(:db)}' AND '#{Time.zone.now.beginning_of_day.tomorrow.to_s(:db)}')"
                  end
 
       params = { :created_at => "last_7_days" }
@@ -334,10 +364,11 @@ class ActiveRecordTest < ActiveSupport::TestCase
     should "return_sql_conditions_on_filtering_typus_users_by_created_at last_30_days" do
       expected = case ENV["DB"]
                  when /postgresql/
-                   "(created_at BETWEEN E'#{Time.new.midnight.prev_month.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                   "(created_at BETWEEN E'#{Time.zone.now.beginning_of_day.prev_month.to_s(:db)}' AND E'#{Time.zone.now.beginning_of_day.tomorrow.to_s(:db)}')"
                  else
-                   "(created_at BETWEEN '#{Time.new.midnight.prev_month.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                   "(created_at BETWEEN '#{Time.zone.now.beginning_of_day.prev_month.to_s(:db)}' AND '#{Time.zone.now.beginning_of_day.tomorrow.to_s(:db)}')"
                  end
+
       params = { :created_at => "last_30_days" }
       assert_equal expected, TypusUser.build_conditions(params).first
     end
@@ -345,9 +376,9 @@ class ActiveRecordTest < ActiveSupport::TestCase
     should "return_sql_conditions_on_filtering_posts_by_published_at today" do
       expected = case ENV["DB"]
                  when /postgresql/
-                   "(published_at BETWEEN E'#{Time.new.midnight.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                   "(published_at BETWEEN E'#{Time.zone.now.beginning_of_day.to_s(:db)}' AND E'#{Time.zone.now.beginning_of_day.tomorrow.to_s(:db)}')"
                  else
-                   "(published_at BETWEEN '#{Time.new.midnight.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                   "(published_at BETWEEN '#{Time.zone.now.beginning_of_day.to_s(:db)}' AND '#{Time.zone.now.beginning_of_day.tomorrow.to_s(:db)}')"
                  end
 
       params = { :published_at => "today" }

data/test/lib/typus/configuration_test.rb

@@ -13,20 +13,20 @@ class ConfigurationTest < ActiveSupport::TestCase
   end
 
   should "load configuration files from config broken" do
-    Typus.expects(:config_folder).at_least_once.returns("../config/broken")
+    Typus.expects(:config_folder).at_least_once.returns("test/fixtures/config/broken")
     assert_not_equal Hash.new, Typus::Configuration.roles!
     assert_not_equal Hash.new, Typus::Configuration.config!
   end
 
   should "load configuration files from config empty" do
-    Typus.expects(:config_folder).at_least_once.returns("../config/empty")
+    Typus.expects(:config_folder).at_least_once.returns("test/fixtures/config/empty")
     assert_equal Hash.new, Typus::Configuration.roles!
     assert_equal Hash.new, Typus::Configuration.config!
   end
 
   should "load configuration files from config ordered" do
-    Typus.expects(:config_folder).at_least_once.returns("../config/ordered")
-    files = Dir[Rails.root.join(Typus.config_folder, "*_roles.yml")]
+    Typus.expects(:config_folder).at_least_once.returns("test/fixtures/config/ordered")
+    files = Dir["#{Typus.config_folder}/*_roles.yml"]
     expected = files.collect { |file| File.basename(file) }.sort
     assert_equal expected, ["001_roles.yml", "002_roles.yml"]
     expected = { "admin" => { "categories" => "read" } }
@@ -34,8 +34,8 @@ class ConfigurationTest < ActiveSupport::TestCase
   end
 
   should "load configuration files from config unordered" do
-    Typus.expects(:config_folder).at_least_once.returns("../config/unordered")
-    files = Dir[Rails.root.join(Typus.config_folder, "*_roles.yml")]
+    Typus.expects(:config_folder).at_least_once.returns("test/fixtures/config/unordered")
+    files = Dir["#{Typus.config_folder}/*_roles.yml"]
     expected = files.collect { |file| File.basename(file) }
     assert_equal expected, ["app_one_roles.yml", "app_two_roles.yml"]
     expected = { "admin" => { "categories" => "read, update" } }
@@ -43,7 +43,7 @@ class ConfigurationTest < ActiveSupport::TestCase
   end
 
   should "load configuration files from config default" do
-    Typus.expects(:config_folder).at_least_once.returns("../config/default")
+    Typus.expects(:config_folder).at_least_once.returns("test/fixtures/config/default")
     assert_not_equal Hash.new, Typus::Configuration.roles!
     assert_not_equal Hash.new, Typus::Configuration.config!
     assert Typus.resources.empty?

data/test/unit/typus_user_test.rb

@@ -15,21 +15,26 @@ class TypusUserTest < ActiveSupport::TestCase
 
   should_not allow_mass_assignment_of :status
 
-  should ensure_length_of(:password).is_at_least(8).is_at_most(40)
+  should ensure_length_of(:password).is_at_least(6).is_at_most(40)
 
   # should validate_uniqueness_of :email
 
+  should "verify columns" do
+    attributes = %w( id first_name last_name email role status salt crypted_password token preferences created_at updated_at )
+    TypusUser.columns.collect { |u| u.name }.each { |c| assert attributes.include?(c) }
+  end
+
+  should "verify generate requires the role" do
+    assert TypusUser.generate(:email => 'demo@example.com', :password => 'XXXXXXXX').valid?
+    assert TypusUser.generate(:email => 'demo@example.com', :password => 'XXXXXXXX', :role => 'admin').valid?
+  end
+
   context "TypusUser" do
 
     setup do
       @typus_user = Factory(:typus_user)
     end
 
-    should "verify definition" do
-      attributes = %w( id first_name last_name email role status salt crypted_password token preferences created_at updated_at )
-      TypusUser.columns.collect { |u| u.name }.each { |c| assert attributes.include?(c) }
-    end
-
     should "return email when first_name and last_name are not set" do
       assert_equal @typus_user.email, @typus_user.name
     end
@@ -40,15 +45,16 @@ class TypusUserTest < ActiveSupport::TestCase
     end
 
     should "verify salt never changes" do
-      salt, crypted_password = @typus_user.salt, @typus_user.crypted_password
-
-      @typus_user.update_attributes :password => '11111111', :password_confirmation => '11111111'
-      assert_equal salt, @typus_user.salt
-      assert_not_equal crypted_password, @typus_user.crypted_password
+      expected = @typus_user.salt
+      @typus_user.update_attributes(:password => '11111111', :password_confirmation => '11111111')
+      assert_equal expected, @typus_user.salt
     end
 
-    should "verify authenticated?" do
+    should "verify authenticated? returns true when password is right" do
       assert @typus_user.authenticated?('12345678')
+    end
+
+    should "verify authenticated? returns false when password is wrong" do
       assert !@typus_user.authenticated?('87654321')
     end
 
@@ -66,24 +72,34 @@ class TypusUserTest < ActiveSupport::TestCase
 
   end
 
-  context "TypusUser which is not root" do
+  context "Root roles" do
 
     setup do
-      @typus_user = Factory(:typus_user, :role => "editor")
+      @typus_user = Factory(:typus_user, :role => "admin")
     end
 
-    should "verify is not root" do
-      assert @typus_user.is_not_root?
-      assert !@typus_user.is_root?
+    should "respond true to is_root?" do
+      assert @typus_user.is_root?
+    end
+
+    should "respond false to is_not_root?" do
+      assert !@typus_user.is_not_root?
     end
 
   end
 
-  context "Class methods" do
+  context "Non root roles" do
 
-    should "verify generate requires the role" do
-      assert TypusUser.generate(:email => 'demo@example.com', :password => 'XXXXXXXX').valid?
-      assert TypusUser.generate(:email => 'demo@example.com', :password => 'XXXXXXXX', :role => 'admin').valid?
+    setup do
+      @typus_user = Factory(:typus_user, :role => "editor")
+    end
+
+    should "respond true to is_no_root?" do
+      assert @typus_user.is_not_root?
+    end
+
+    should "respond false to is_root?" do
+      assert !@typus_user.is_root?
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: typus
 version: !ruby/object:Gem::Version 
-  hash: 961915988
+  hash: -1876988175
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - pre
-  version: 1.0.0.pre
+  - pre2
+  version: 1.0.0.pre2
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +02:00
+date: 2010-09-13 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -31,11 +31,12 @@ extra_rdoc_files: []
 
 files: 
 - app/controllers/admin/account_controller.rb
+- app/controllers/admin/base_controller.rb
 - app/controllers/admin/dashboard_controller.rb
 - app/controllers/admin/resource_controller.rb
 - app/controllers/admin/resources_controller.rb
 - app/controllers/admin/session_controller.rb
-- app/controllers/admin_controller.rb
+- app/helpers/admin/base_helper.rb
 - app/helpers/admin/dashboard_helper.rb
 - app/helpers/admin/filters_helper.rb
 - app/helpers/admin/form_helper.rb
@@ -45,7 +46,6 @@ files:
 - app/helpers/admin/search_helper.rb
 - app/helpers/admin/sidebar_helper.rb
 - app/helpers/admin/table_helper.rb
-- app/helpers/admin_helper.rb
 - app/mailers/admin/mailer.rb
 - app/models/admin/fake_user.rb
 - app/views/admin/account/forgot_password.html.erb
@@ -92,8 +92,8 @@ files:
 - app/views/admin/templates/_text.html.erb
 - app/views/admin/templates/_time.html.erb
 - app/views/admin/templates/_tree.html.erb
+- app/views/layouts/admin/base.html.erb
 - app/views/layouts/admin/session.html.erb
-- app/views/layouts/admin.html.erb
 - CHANGELOG
 - config/available_locales/ca.yml
 - config/available_locales/ca_models.yml
@@ -288,8 +288,25 @@ files:
 - test/fixtures/rails_app/Rakefile
 - test/fixtures/rails_app/README
 - test/fixtures/rails_app/script/rails
-- test/fixtures/rails_app/tmp/export-posts-20100902120447.csv
-- test/fixtures/rails_app/tmp/export-posts-20100902120700.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913124503.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913124524.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913124638.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913124717.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913125425.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913125626.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913125651.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913125741.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913125827.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913125856.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913125928.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913130119.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913130159.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913130319.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913130339.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913131400.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913131915.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913132022.csv
+- test/fixtures/rails_app/tmp/export-posts-20100913132844.csv
 - test/functional/admin/account_controller_test.rb
 - test/functional/admin/dashboard_controller_http_basic_test.rb
 - test/functional/admin/dashboard_controller_none_test.rb
@@ -332,7 +349,6 @@ files:
 - test/unit/admin/mailer_test.rb
 - test/unit/typus_user_roles_test.rb
 - test/unit/typus_user_test.rb
-- typus-1.0.0.pre.gem
 - typus.gemspec
 has_rdoc: true
 homepage: http://core.typuscms.com/

data/app/helpers/admin_helper.rb

@@ -1,56 +0,0 @@
-module AdminHelper
-
-  def typus_block(resource = @resource.to_resource, partial = params[:action])
-    partials_path = "admin/#{resource}"
-    resources_partials_path = "admin/resources"
-
-    partials = ActionController::Base.view_paths.map do |view_path|
-      Dir["#{view_path}/#{partials_path}/*"].map { |f| File.basename(f, '.html.erb') }
-    end.flatten
-    resources_partials = Dir[Rails.root.join("app/views/#{resources_partials_path}/*").to_s].map do |file|
-                           File.basename(file, ".html.erb")
-                         end
-
-    path = if partials.include?("_#{partial}") then partials_path
-           elsif resources_partials.include?(partial) then resources_partials_path
-           end
-
-    render "#{path}/#{partial}" if path
-  end
-
-  def title(page_title)
-    content_for(:title) { page_title }
-  end
-
-  def header
-    render "admin/helpers/header"
-  end
-
-  def apps
-    render "admin/helpers/apps"
-  end
-
-  def login_info(user = @current_user)
-    return if user.kind_of?(Admin::FakeUser)
-
-    admin_edit_typus_user_path = { :controller => "/admin/#{Typus.user_class.to_resource}",
-                                   :action => 'edit',
-                                   :id => user.id }
-
-    message = _("Are you sure you want to sign out and end your session?")
-
-    user_details = if user.can?('edit', Typus.user_class_name)
-                     link_to user.name, admin_edit_typus_user_path
-                   else
-                     user.name
-                   end
-
-    render "admin/helpers/login_info", :message => message, :user_details => user_details
-  end
-
-  def display_flash_message(message = flash)
-    return if message.empty?
-    render "admin/helpers/flash_message", :flash_type => message.keys.first, :message => message
-  end
-
-end