typus 3.0.12 → 3.1.0.rc1

data/config/locales/typus.el.yml

@@ -75,7 +75,7 @@ el:
   "You can't change your role": "Δεν έχετε την δυνατότητα να αλλάξετε τον ρόλο σας"
   "You can't toggle your status": "Δεν επιτρέπεται η αλλαγή της κατάστασής σας"
 
-  "%{errors} errors prohibited this page from being saved:":
+  "%{errors} prohibited this page from being saved:":
   "%{model} successfully created": "Το μοντέλο %{model} δημιουργήθηκε επιτυχώς"
   "%{model} successfully removed": "Το μοντέλο %{model} απομακρύνθηκε επιτυχώς"
   "%{model} successfully updated": "Το μοντέλο %{model} ανανεώθηκε επιτυχώς"

data/config/locales/typus.es.yml

@@ -76,7 +76,7 @@ es:
   "View all %{attribute}":
   "View site": "Ver web"
 
-  "%{errors} errors prohibited this page from being saved:":
+  "%{errors} prohibited this page from being saved:":
   "%{model} successfully created": "%{model} satisfactoriamente creado."
   "%{model} successfully removed": "%{model} satisfactoriamente eliminado."
   "%{model} successfully updated": "%{model} satisfactoriamente actualizado."

data/config/locales/typus.fr.yml

@@ -22,7 +22,6 @@ fr:
   "Edit": "Éditer"
   "Edit %{resource}": "Éditer %{resource}"
   "Enter your email below to create the first user": "Entrez votre adresse email pour créer le premier utilisateur"
-  "Export as %{mime}": "Exporter en %{mime}"
 
   "False": "Faux"
   "Filter": "Filtrer"
@@ -81,7 +80,7 @@ fr:
   "You can't change your role": "Vous ne pouvez pas changer votre propre rôle."
   "You can't toggle your status": "Vous ne pouvez pas basculer votre statut"
 
-  "%{errors} errors prohibited this page from being saved:":
+  "%{errors} prohibited this page from being saved:":
   "%{model} successfully created": "%{model} correctement créé(e)."
   "%{model} successfully removed": "%{model} correctement supprimé(e)."
   "%{model} successfully updated": "%{model} correctement mis(e)-à-jour."

data/config/locales/typus.hu.yml

@@ -74,7 +74,7 @@ hu:
   "You can't change your role": "Nincsen jogod megváltoztatni a jogosultsági szintedet"
   "You can't toggle your status": "Nincs jogod változtatni a státuszodat"
 
-  "%{errors} errors prohibited this page from being saved:":
+  "%{errors} prohibited this page from being saved:":
   "%{model} successfully created": "%{model} sikeresen létrehozva"
   "%{model} successfully removed": "%{model} sikeresen törölve"
   "%{model} successfully updated": "%{model} sikereseb frissítve"

data/config/locales/typus.locale.yml.template

@@ -75,7 +75,7 @@
   "You can't change your role":
   "You can't toggle your status":
 
-  "%{errors} errors prohibited this page from being saved:":
+  "%{errors} prohibited this page from being saved:":
   "%{model} successfully created":
   "%{model} successfully removed":
   "%{model} successfully updated":

data/config/locales/typus.pt-BR.yml

@@ -74,7 +74,7 @@ pt-BR:
   "You can update your password at": "Você pode atualizar sua senha em"
   "You can't change your role": "Você não pode mudar sua própria função no sistema."
 
-  "%{errors} errors prohibited this page from being saved:":
+  "%{errors} prohibited this page from being saved:":
   "%{model} successfully created": "%{model} criado com sucesso."
   "%{model} successfully removed": "%{model} removido com sucesso."
   "%{model} successfully updated": "%{model} atualizado com sucesso."

data/config/locales/typus.ru.yml

@@ -74,7 +74,7 @@ ru:
   "You can't change your role": "Вы не можете менять свою собственную роль"
   "You can't toggle your status": "Вы не можете менять свой статус"
 
-  "%{errors} errors prohibited this page from being saved:":
+  "%{errors} prohibited this page from being saved:":
   "%{model} successfully created": "%{model} создан"
   "%{model} successfully removed": "%{model} удален"
   "%{model} successfully updated": "%{model} успешно обновлен"

data/config/locales/typus.zh-CN.yml

@@ -73,7 +73,7 @@ zh-CN:
   "You can't change your role": "你不能修改你的角色"
   "You can't toggle your status": "你不能修改自己的状态"
 
-  "%{errors} errors prohibited this page from being saved:":
+  "%{errors} prohibited this page from being saved:":
   "%{model} successfully created": "%{model} 创建成功"
   "%{model} successfully removed": "%{model} 删除成功"
   "%{model} successfully updated": "%{model} 更新成功"

data/config/routes.rb

@@ -19,11 +19,11 @@ Rails.application.routes.draw do
     end
 
     Typus.models.map { |i| i.to_resource }.each do |resource|
-      match "#{resource}(/:action(/:id(.:format)))", :controller => resource
+      match "#{resource}(/:action(/:id))(.:format)", :controller => resource
     end
 
     Typus.resources.map { |i| i.underscore }.each do |resource|
-      match "#{resource}(/:action(/:id(.:format)))", :controller => resource
+      match "#{resource}(/:action(/:id))(.:format)", :controller => resource
     end
 
   end

data/lib/generators/templates/config/initializers/typus.rb

@@ -20,9 +20,7 @@ Typus.setup do |config|
   # config.username = "admin"
   # config.password = "columbia"
 
-  # Pagination options:
-  # These options are passed to `will_paginate`. You can see the available
-  # options in the plugin source. (https://github.com/mislav/will_paginate/blob/rails3/lib/will_paginate/view_helpers.rb)
+  # Pagination options: These options are passed to `kaminari`.
   # config.pagination = { :previous_label => "← " + Typus::I18n.t("Previous"),
   #                       :next_label => Typus::I18n.t("Next") + " →" }
 

data/lib/generators/templates/config/typus/README

@@ -26,7 +26,6 @@ most common settings.
         index: cleanup
         edit: send_as_newsletter
         show: rebuild
-      export: csv, xml
       order_by: created_at
       relationships:
       filters: is_published?, created_at, category_id

data/lib/generators/typus/migration_generator.rb

@@ -43,9 +43,6 @@ Examples:
         inject_into_class "app/models/#{model_filename}.rb", options[:user_class_name] do
           <<-MSG
 
-  ROLE = Typus::Configuration.roles.keys.sort
-  LOCALE = Typus.locales
-
   enable_as_typus_user
 
           MSG

data/lib/support/active_record.rb

@@ -25,7 +25,13 @@ class ActiveRecord::Base
   #     => "Publicado"
   #++
   def mapping(attribute)
-    values = self.class::const_get(attribute.to_s.upcase).to_a
+    klass = self.class
+    values = if klass.const_defined?(attribute.upcase)
+               klass::const_get(attribute.upcase)
+             else
+               klass.send(attribute)
+             end
+
     array = values.first.is_a?(Array) ? values : values.map { |i| [i, i] }
 
     value = array.rassoc(send(attribute))
@@ -40,12 +46,4 @@ class ActiveRecord::Base
     end
   end
 
-  def self.namespaced?
-    name.match(/::/)
-  end
-
-  def self.namespace
-    name.split("::").first if self.namespaced?
-  end
-
 end

data/lib/typus.rb

@@ -11,8 +11,7 @@ require "typus/orm/active_record"
 require "typus/regex"
 require "typus/version"
 
-require "render_inheritable"
-require "will_paginate"
+require "kaminari"
 
 autoload :FakeUser, "support/fake_user"
 
@@ -46,7 +45,7 @@ module Typus
 
   mattr_accessor :admin_sub_title
   @@admin_sub_title = <<-CODE
-<a href="http://core.typuscms.com/">typus</a> by <a href="http://intraducibles.com">intraducibles.com</a>
+<a href="http://core.typuscms.com/">core.typuscms.com</a>
   CODE
 
   ##
@@ -66,10 +65,11 @@ module Typus
   @@username = "admin"
 
   ##
-  # Pagination options
+  # Pagination options passed to Kaminari helper.
   #
   mattr_accessor :pagination
-  @@pagination = { :previous_label => "&larr; " + Typus::I18n.t("Previous"),
+  @@pagination = { :window => 0,
+                   :previous_label => "&larr; " + Typus::I18n.t("Previous"),
                    :next_label => Typus::I18n.t("Next") + " &rarr;" }
 
   ##
@@ -137,7 +137,7 @@ module Typus
 
     # Lists modules of an application.
     def application(name)
-      Typus::Configuration.config.map { |i| i.first if i.last["application"] == name }.compact.uniq
+      Typus::Configuration.config.map { |i| i.first if i.last["application"] == name }.compact.uniq.sort
     end
 
     # Lists models from the configuration file.
@@ -175,8 +175,7 @@ module Typus
         "Français" => "fr",
         "Magyar" => "hu",
         "Italiano" => "It",
-        "Portuguese" => "pt-PT",
-        "Brazilian Portuguese" => "pt-BR",
+        "Portuguese" => "pt-BR",
         "Russian" => "ru",
         "中文" => "zh-CN" }
     end

data/lib/typus/authentication/session.rb

@@ -10,8 +10,9 @@ module Typus
         if session[:typus_user_id]
           admin_user
         else
-          back_to = request.env['PATH_INFO'] unless [admin_dashboard_path, admin_path].include?(request.env['PATH_INFO'])
-          redirect_to new_admin_session_path(:back_to => back_to)
+          # back_to = request.env['PATH_INFO'] unless [root_path].include?(request.env['PATH_INFO'])
+          # redirect_to new_session_path(:back_to => back_to)
+          redirect_to new_admin_session_path
         end
       end
 

data/lib/typus/controller/associations.rb

@@ -62,7 +62,7 @@ module Typus
         if worked
           notice = Typus::I18n.t("%{model} successfully updated.", :model => item_class.model_name.human)
         else
-          alert = item.errors.full_messages
+          alert = item.error.full_messages
         end
 
         redirect_to :back, :notice => notice, :alert => alert
@@ -126,7 +126,7 @@ module Typus
       #
       def set_belongs_to_association(item_class, options)
         association_name = item_class.model_name.tableize.to_sym
-        foreign_key = @resource.reflect_on_association(association_name).primary_key_name
+        foreign_key = @resource.reflect_on_association(association_name).foreign_key
 
         if params[:resource_id]
           item = item_class.find(params[:resource_id])

data/lib/typus/controller/format.rb

@@ -1,8 +1,8 @@
 if RUBY_VERSION >= '1.9'
   require 'csv'
-  FasterCSV = CSV
 else
   require 'fastercsv'
+  CSV = FasterCSV
 end
 
 module Typus
@@ -13,7 +13,7 @@ module Typus
 
       def generate_html
         items_per_page = @resource.typus_options_for(:per_page)
-        @items = @resource.paginate(:per_page => items_per_page, :page => params[:page])
+        @items = @resource.page(params[:page]).per(items_per_page)
       end
 
       #--
@@ -28,7 +28,7 @@ module Typus
 
         options = { :conditions => @conditions, :batch_size => 1000 }
 
-        ::FasterCSV.open(filename, 'w') do |csv|
+        ::CSV.open(filename, 'w', :col_sep => ';') do |csv|
           csv << fields.keys
           @resource.find_in_batches(options) do |records|
             records.each do |record|

data/lib/typus/engine.rb

@@ -1,11 +1,7 @@
-module Typus
+module Admin
   class Engine < Rails::Engine
 
-    initializer "static assets" do |app|
-      if app.config.serve_static_assets
-        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/app/assets"
-      end
-    end
+#    isolate_namespace Admin
 
   end
 end

data/lib/typus/i18n.rb

@@ -22,6 +22,10 @@ module Typus
         ::I18n.t(msg, options)
       end
 
+      def default_locale
+        :en
+      end
+
     end
 
   end

data/lib/typus/orm/active_record/admin_user_v1.rb

@@ -12,10 +12,7 @@ module Typus
             attr_accessor :password
             attr_protected :status
 
-            validates :email,
-                      :presence => true,
-                      :uniqueness => true,
-                      :format => { :with => Typus::Regex::Email }
+            validates :email, :presence => true, :uniqueness => true, :format => { :with => Typus::Regex::Email }
 
             validates :password,
                       :confirmation => { :if => :password_required? },
@@ -25,7 +22,7 @@ module Typus
 
             validates :role, :presence => true
 
-            before_save :initialize_salt, :encrypt_password, :initialize_token
+            before_save :initialize_salt, :encrypt_password, :set_token
 
             serialize :preferences
 
@@ -36,11 +33,19 @@ module Typus
 
             def generate(*args)
               options = args.extract_options!
-              options[:password] ||= ActiveSupport::SecureRandom.hex(4)
+              options[:password] ||= Typus.password
               options[:role] ||= Typus.master_role
               new :email => options[:email], :password => options[:password], :role => options[:role]
             end
 
+            def role
+              Typus::Configuration.roles.keys.sort
+            end
+
+            def locale
+              Typus.locales
+            end
+
             include InstanceMethods
             include Typus::Orm::ActiveRecord::User::InstanceMethods
 
@@ -73,12 +78,8 @@ module Typus
             self.salt = generate_hash("--#{Time.zone.now.to_s(:number)}--#{email}--") if new_record?
           end
 
-          def initialize_token
-            generate_token if new_record?
-          end
-
-          def generate_token
-            self.token = encrypt("--#{Time.zone.now.to_s(:number)}--#{password}--").first(12)
+          def set_token
+            self.token = "#{ActiveSupport::SecureRandom.hex(3)}-#{ActiveSupport::SecureRandom.hex(3)}"
           end
 
           def password_required?

data/lib/typus/orm/active_record/admin_user_v2.rb

@@ -12,14 +12,34 @@ module Typus
 
             attr_reader   :password
             attr_accessor :password_confirmation
+            attr_protected :status
 
             validates :email, :presence => true, :uniqueness => true, :format => { :with => Typus::Regex::Email }
-            validates :password, :confirmation => true, :length => { :within => 6..40 }
+            validates :password, :confirmation => true
             validates :password_digest, :presence => true
 
+            validate :password_must_be_strong
+
             include InstanceMethodsOnActivation
             include Typus::Orm::ActiveRecord::User::InstanceMethods
 
+            serialize :preferences
+
+            before_save :set_token
+
+            def self.role
+              Typus::Configuration.roles.keys.sort
+            end
+
+            def self.locale
+              Typus.locales
+            end
+
+            def self.authenticate(email, password)
+              user = find_by_email_and_status(email, true)
+              user && user.authenticate(password) ? user : nil
+            end
+
           end
 
         end
@@ -41,6 +61,16 @@ module Typus
             self.password_digest = BCrypt::Password.create(unencrypted_password)
           end
 
+          def set_token
+            self.token = "#{ActiveSupport::SecureRandom.hex(6)}-#{ActiveSupport::SecureRandom.hex(6)}"
+          end
+
+          def password_must_be_strong
+            if password.present?
+              errors.add(:password, :too_short, :count => 7) unless password.size > 6
+            end
+          end
+
         end
 
       end

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

@@ -66,6 +66,7 @@ module Typus
                 next
               end
 
+              # TODO: This is not tested!
               if virtual_fields.include?(field.to_s)
                 fields_with_type[field.to_s] = :virtual
               end

data/lib/typus/orm/base.rb

@@ -79,10 +79,6 @@ module Typus
         end
       end
 
-      def typus_export_formats
-        read_model_config['export'].try(:extract_settings) || []
-      end
-
       def typus_order_by
         typus_defaults_for(:order_by).map do |field|
           field.include?('-') ? "#{table_name}.#{field.delete('-')} DESC" : "#{table_name}.#{field} ASC"

data/lib/typus/regex.rb

@@ -3,6 +3,8 @@ module Typus
 
     Email = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/
 
+    Domain = /^(((?:[-a-z0-9]+\.)+[a-z]{2,}))/
+
     Url = /(^$)|(^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$)/ix
 
   end

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.0.12"
+  VERSION = "3.1.0.rc1"
 end

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

@@ -0,0 +1,94 @@
+require "test_helper"
+
+=begin
+
+  What's being tested here?
+
+    - Create first user. (/admin/account/new)
+    - Stuff that happens when there are already users.
+
+=end
+
+class Admin::AccountControllerTest < ActionController::TestCase
+
+  context "No users" do
+
+    should "render new when there are not admin users" do
+      get :new
+
+      assert_response :success
+      assert_template "new"
+      assert_template "layouts/admin/session"
+      assert_equal "Enter your email below to create the first user.", flash[:notice]
+    end
+
+    should "verify forgot_password redirects to new when there are no admin users" do
+      get :forgot_password
+      assert_response :redirect
+      assert_redirected_to new_admin_account_path
+    end
+
+    should "verify send_password redirects to new when there are no admin users"
+
+    should "not sign_up invalid emails" do
+      post :create, :typus_user => { :email => "example.com" }
+      assert_response :redirect
+      assert_redirected_to :action => :new
+      assert flash.empty?
+    end
+
+    should "sign_up a valid email" do
+      assert_difference('TypusUser.count') { post :create, :typus_user => { :email => "john@example.com" } }
+      assert_response :redirect
+      assert_redirected_to :action => "show", :id => TypusUser.find_by_email("john@example.com").token
+    end
+
+  end
+
+  context "There are users" do
+
+    setup do
+      @typus_user = Factory(:typus_user)
+    end
+
+    should "new redirect new admin session when there are admin users" do
+      get :new
+      assert_response :redirect
+      assert_redirected_to new_admin_session_path
+    end
+
+    should "verify forgot_password is rendered when there are admin users" do
+      get :forgot_password
+      assert_response :success
+      assert_template "forgot_password"
+    end
+
+    should "not_send_recovery_password_link_to_unexisting_user" do
+      post :send_password, :typus_user => { :email => "unexisting" }
+      assert_response :success
+      assert flash.empty?
+    end
+
+    should "test_should_send_recovery_password_link_to_existing_user" do
+      post :send_password, :typus_user => { :email => @typus_user.email }
+      assert_response :redirect
+      assert_redirected_to new_admin_session_path
+      assert_equal "Password recovery link sent to your email.", flash[:notice]
+    end
+
+    should "test_should_create_admin_user_session_and_redirect_user_to_its_details" do
+      get :show, :id => @typus_user.token
+      assert_equal @typus_user.id, @request.session[:typus_user_id]
+      assert_response :redirect
+      assert_redirected_to :controller => "/admin/typus_users", :action => "edit", :id => @typus_user.id
+    end
+
+    should "test_should_return_404_on_reset_passsword_if_token_is_not_valid" do
+      assert_raises ActiveRecord::RecordNotFound do
+        get :show, :id => "unexisting"
+      end
+    end
+
+  end
+
+end