fesplugas-typus 0.9.7 → 0.9.8

data/README.rdoc

@@ -8,15 +8,14 @@
 extensible enough to match lots of use cases.
 
 - Project site and documentation http://intraducibles.com/projects/typus
-- Screenshoots http://intraducibles.com/projects/typus/screenshots
 - Plugin source http://github.com/fesplugas/typus/tree
 - Google Group http://groups.google.es/group/typus
 
-== For the impatients: Demo in 3 steps
+== Impatients to see it working?
 
 Step 1: Create a Rails application using a template.
 
-    $ rails example.com -m http://intraducibles.com/projects/typus/demo.txt
+    $ rails example.com -m http://gist.github.com/86613.txt
 
 Step 2: Start the server:
 
@@ -28,14 +27,10 @@ Step 3: Go to the admin area and enjoy it!
 
 == Installing
 
-*Plugin*: Install from GitHub the latest version which it's compatible with Rails 2.3.2.
+Install from GitHub the latest version which it's compatible with Rails 2.3.2.
 
     $ script/plugin install git://github.com/fesplugas/typus.git
 
-*Gem*: Add *Typus* to your <tt>config/environment.rb</tt>.
-
-    config.gem 'fesplugas-typus', :lib => 'typus', :source => 'http://gems.github.com'
-
 Once *Typus* is installed, run the generator to create required files and migrate your 
 database. (<tt>typus_users</tt> table is created)
 

data/VERSION

@@ -1 +1 @@
-0.9.7
+0.9.8

data/app/controllers/admin/master_controller.rb

@@ -127,7 +127,7 @@ class Admin::MasterController < ApplicationController
       path = if @resource[:class].typus_options_for(:index_after_save)
                params[:back_to] ? "#{params[:back_to]}##{@resource[:self]}" : { :action => 'index' }
              else
-               { :action => @resource[:class].typus_options_for(:default_action_on_item), :id => @item.id }
+               { :action => @resource[:class].typus_options_for(:default_action_on_item), :id => @item.id, :back_to => params[:back_to] }
              end
       redirect_to path
     else
@@ -246,14 +246,11 @@ private
     # If current_user is a root user, by-pass.
     return if @current_user.is_root?
 
-    # If the current model doesn't include a key which relates it with the
-    # current_user, by-pass.
-    return unless @item.respond_to?(Typus.user_fk)
-
-    # If item is owned by the user ...
-    unless @item.send(Typus.user_fk) == session[:typus_user_id]
-      flash[:notice] = _("Record owned by another user.")
-      redirect_to :action => 'show', :id => @item.id
+    # OPTIMIZE: `typus_users` is currently hard-coded. We should find a good name for this option.
+    if @item.respond_to?('typus_users') && !@item.send('typus_users').include?(@current_user) ||
+       @item.respond_to?(Typus.user_fk) && !(@item.send(Typus.user_fk) == session[:typus_user_id])
+       flash[:notice] = _("You don't have permission to access this item.")
+       redirect_to :back
     end
 
   end
@@ -323,12 +320,13 @@ private
       path = "#{params[:back_to]}?#{params[:selected]}=#{@item.id}"
     when :polymorphic
       resource.send(@item.class.name.tableize).create(params[:item])
+      path = "#{params[:back_to]}##{@resource[:self]}"
     end
 
     flash[:success] = message || _("{{model_a}} successfully assigned to {{model_b}}.", 
                                  :model_a => @item.class, 
                                  :model_b => resource_class.name)
-    redirect_to path || "#{params[:back_to]}##{@resource[:self]}"
+    redirect_to path || params[:back_to]
 
   end
 

data/app/helpers/admin/form_helper.rb

@@ -180,11 +180,17 @@ module Admin::FormHelper
 
   def typus_relationships
 
+    # OPTIMIZE
     @back_to = '/' + [ params[:controller], params[:action], params[:id] ].compact.join('/')
 
     returning(String.new) do |html|
       @resource[:class].typus_defaults_for(:relationships).each do |relationship|
-        case @resource[:class].reflect_on_association(relationship.to_sym).macro
+
+        association = @resource[:class].reflect_on_association(relationship.to_sym)
+
+        next if !@current_user.can_perform?(association.class_name.constantize, 'read')
+
+        case association.macro
         when :has_and_belongs_to_many
           html << typus_form_has_and_belongs_to_many(relationship)
         when :has_many
@@ -192,6 +198,7 @@ module Admin::FormHelper
         when :has_one
           html << typus_form_has_one(relationship)
         end
+
       end
     end
 
@@ -209,7 +216,7 @@ module Admin::FormHelper
 
       link_options = { :controller => "admin/#{field}", 
                        :action => 'new', 
-                       :back_to => @back_to, 
+                       :back_to => "#{@back_to}##{field}", 
                        :resource => @resource[:self].singularize, 
                        :resource_id => @item.id, 
                        foreign_key => @item.id }
@@ -218,13 +225,19 @@ module Admin::FormHelper
 <a name="#{field}"></a>
 <div class="box_relationships">
   <h2>
-  #{link_to model_to_relate.human_name.pluralize, :controller => "admin/#{model_to_relate_as_resource}"}
+  #{link_to model_to_relate.human_name.pluralize, { :controller => "admin/#{model_to_relate_as_resource}", foreign_key => @item.id }, :title => _('{{model}} filtered by {{filtered_by}}', :model => model_to_relate.human_name.pluralize, :filtered_by => @item.typus_name)}
   <small>#{link_to _('Add new'), link_options if @current_user.can_perform?(model_to_relate, 'create')}</small>
   </h2>
       HTML
-      items = @resource[:class].find(params[:id]).send(field).find(:all, :order => model_to_relate.typus_order_by)
+
+      conditions = if model_to_relate.typus_options_for(:only_user_items) && !@current_user.is_root?
+                    { Typus.user_fk => @current_user }
+                  end
+
+      items = @resource[:class].find(params[:id]).send(field).find(:all, :order => model_to_relate.typus_order_by, :conditions => conditions)
+
       unless items.empty?
-        options = { :back_to => @back_to, :resource => @resource[:self], :resource_id => @item.id }
+        options = { :back_to => "#{@back_to}##{field}", :resource => @resource[:self], :resource_id => @item.id }
         html << build_list(model_to_relate, 
                            model_to_relate.typus_fields_for(:relationship), 
                            items, 

data/app/helpers/admin/master_helper.rb

@@ -6,23 +6,23 @@ module Admin::MasterHelper
   include Admin::FormHelper
   include Admin::TableHelper
 
-  def display_link_to_previous(klass = @resource[:class], _params = params)
+  def display_link_to_previous # (_params = params)
 
     options = {}
-    options[:resource_from] = klass.human_name
-    options[:resource_to] = _params[:resource].classify.humanize if _params[:resource]
+    options[:resource_from] = @resource[:class].human_name
+    options[:resource_to] = params[:resource].classify.humanize if params[:resource]
 
-    editing = %w( edit update ).include?(_params[:action])
+    editing = %w( edit update ).include?(params[:action])
 
     message = case
-              when _params[:resource] && editing
+              when params[:resource] && editing
                 _("You're updating a {{resource_from}} for {{resource_to}}.", 
                   :resource_from =>  options[:resource_from], 
                   :resource_to => options[:resource_to])
               when editing
                 _("You're updating a {{resource_from}}.", 
                   :resource_from => options[:resource_from])
-              when _params[:resource]
+              when params[:resource]
                 _("You're adding a new {{resource_from}} to {{resource_to}}.", 
                   :resource_from => options[:resource_from], 
                   :resource_to => options[:resource_to])
@@ -34,7 +34,7 @@ module Admin::MasterHelper
     returning(String.new) do |html|
       html << <<-HTML
 <div id="flash" class="notice">
-  <p>#{message} #{link_to _("Do you want to cancel it?"), _params[:back_to]}</p>
+  <p>#{message} #{link_to _("Do you want to cancel it?"), params[:back_to]}</p>
 </div>
       HTML
     end

data/app/helpers/admin/sidebar_helper.rb

@@ -13,12 +13,6 @@ module Admin::SidebarHelper
 #{build_typus_list(export, :header => 'export')}
       HTML
 
-      %w( parent_module submodules ).each do |block|
-        html << <<-HTML
-#{build_typus_list(modules(block), :header => block)}
-        HTML
-      end
-
     end
 
   end
@@ -88,23 +82,6 @@ module Admin::SidebarHelper
 
   end
 
-  def modules(name)
-
-    models = case name
-             when 'parent_module': Typus.parent(@resource[:class], 'module')
-             when 'submodules':    Typus.module(@resource[:class])
-             end
-
-    return [] if models.empty?
-
-    returning(Array.new) do |items|
-      models.each do |model|
-        items << (link_to model.humanize, :controller => model.tableize)
-      end
-    end
-
-  end
-
   def previous_and_next
     return [] unless %w( edit show update ).include?(params[:action])
     returning(Array.new) do |items|

data/app/helpers/typus_helper.rb

@@ -136,7 +136,7 @@ module TypusHelper
 
     <<-HTML
 <ul>
-  <li>#{_('Logged as')} #{link_to user.full_name(:display_role => true), admin_edit_typus_user_path}</li>
+  <li>#{_('Logged as')} #{link_to user.name, admin_edit_typus_user_path, :title => "#{user.email} (#{user.role})"}</li>
   <li>#{link_to _('Sign out'), admin_sign_out_path }</li>
 </ul>
     HTML

data/app/views/admin/dashboard/_sidebar.html.erb

@@ -4,6 +4,6 @@
 
 <p>If you need help don't hesitate in joining the <%= link_to 'Typus', 'http://groups.google.com/group/typus', :rel => 'external' %> mailing list.</p>
 
-<p>Replace this message adding a <code>_sidebar.html.erb</code> file on the <code>app/views/admin/dashboard</code> folder.</p>
+<p>Remember you can replace this sidebar adding <code>_sidebar.html.erb</code> file on <code>app/views/admin/dashboard</code> folder.</p>
 
 <p>Have a nice day!</p>

data/app/views/admin/resources/show.html.erb

@@ -14,4 +14,6 @@
   <dt><%=h @resource[:class].human_attribute_name(column) %></dt>
   <dd><%=h (!@item.send(column).blank?) ? @item.send(column) : 'nil' %></dd>
 <%- end -%>
-</dl>
+</dl>
+
+<%= typus_relationships %>

data/config/locales/es.yml

@@ -81,10 +81,7 @@ es:
   "{{current_user_role}} can't go to {{action}} on {{controller}}":  "{{current_user_role}} no pude ir a {{action}} en {{controller}}."
   "{{current_user_role}} can't delete this item": "{{current_user_role}} no puede borrar este elemento."
   "{{current_user_role}} can't perform action ({{action}})": "{{current_user_role}} no puede relizar la accion ({{action}})"
-  "Record owned by another user": "Registro propiedad de otro usuario."
   "{{current_user_role}} can't display items": "{{current_user_role}} no puede mostrar los elementos."
-  "Submodules": "Submodulos"
-  "Parent module": "Modulo padre"
   "You can update your password at": "Puedes actualizar tu contraseña en"
   "If you didn't request a password update, you can ignore this message": "Si no pediste una actualización de tu contraseña, puedes ignorar este mensaje."
   "Have a nice day": "Que tengas un buen dia."
@@ -102,4 +99,5 @@ es:
   "Today": "Hoy"
   "Past 7 days": "Últimos 7 dias"
   "This month": "Este mes"
-  "This year": "Este año"
+  "This year": "Este año"
+  "{{model}} filtered by {{filtered_by}}": "{{model}} filtrados por {{filtered_by}}"

data/config/locales/pt-BR.yml

@@ -81,10 +81,7 @@ pt-BR:
   "{{current_user_role}} can't go to {{action}} on {{controller}}":  "{{current_user_role}} não pode ir a {{action}} no {{controller}}."
   "{{current_user_role}} can't delete this item": "{{current_user_role}} não pode apagar este item."
   "{{current_user_role}} can't perform action ({{action}})": "{{current_user_role}} não pode realizar a ação ({{action}})"
-  "Record owned by another user": "Registro é propriedade de outro usuário."
   "{{current_user_role}} can't display items": "{{current_user_role}} não pode mostrar os items."
-  "Submodules": "Submódulos"
-  "Parent module": "Módulo pai"
   "You can update your password at": "Você pode atualizar sua senha em"
   "If you didn't request a password update, you can ignore this message": "Se você não pediu uma renovação de senha, por favor ignore esta mensagem."
   "Have a nice day": "Tenha um bom dia."
@@ -104,4 +101,5 @@ pt-BR:
   "This month": "Este mês"
   "This year": "Este ano"
   "Created at": "Criado em"
-  "Updated at": "Atualizado em"
+  "Updated at": "Atualizado em"
+  "{{model}} filtered by {{filtered_by}}": 

data/config/locales/ru.yml

@@ -81,10 +81,7 @@ ru:
   "{{current_user_role}} can't go to {{action}} on {{controller}}":  "{{current_user_role}} не может перейти к {{action}} в {{controller}}."
   "{{current_user_role}} can't delete this item": "{{current_user_role}} не может удалить эту запись"
   "{{current_user_role}} can't perform action ({{action}})": "{{current_user_role}} не может выполнить действие ({{action}})"
-  "Record owned by another user": "Запись принадлежит другому пользователю."
   "{{current_user_role}} can't display items": "{{current_user_role}} не может отобразить записи"
-  "Submodules": "Подмодули"
-  "Parent module": "Дочерний модуль"
   "You can update your password at": "Вы можете установить свой пароль на"
   "If you didn't request a password update, you can ignore this message": "Если Вы не запрашивали обновление пароля, Вы можете проигнорировать это сообщение."
   "Have a nice day": "Добрый день."
@@ -104,4 +101,5 @@ ru:
   "This month": "Этот месяц"
   "This year": "Этот год"
   "Created at": "Создано"
-  "Updated at": "Обновлено"
+  "Updated at": "Обновлено"
+  "{{model}} filtered by {{filtered_by}}": 

data/generators/typus/templates/config/typus/application.yml

@@ -35,7 +35,7 @@
 #     index_after_save: false
 #     minute_step: 15
 #     nil: 'nil'
-#     only_user_items: false
+#     only_user_items: true
 #     per_page: 5
 #     sidebar_selector: 5
 #     start_year: 1990

data/lib/typus/user.rb

@@ -55,11 +55,8 @@ module Typus
 
     module InstanceMethods
 
-      def full_name(*args)
-        options = args.extract_options!
-        full_name = (!first_name.empty? && !last_name.empty?) ? "#{first_name} #{last_name}" : email
-        full_name << " (#{role})" if options[:display_role]
-        return full_name
+      def name
+        (!first_name.empty? && !last_name.empty?) ? "#{first_name} #{last_name}" : email
       end
 
      def authenticated?(password)

data/lib/typus.rb

@@ -29,23 +29,6 @@ module Typus
       Typus::Configuration.config.collect { |i| i.first if i.last['application'] == name }.compact.uniq.sort
     end
 
-    ##
-    # Returns a list of the submodules of a module.
-    #
-    def module(name)
-      Typus::Configuration.config.collect { |i| i.first if i.last['module'] == name.name }.compact.uniq.sort
-    end
-
-    ##
-    # Parent
-    #
-    #  Typus::Configuration.config['Post']['module']
-    #  Typus::Configuration.config['Post']['application']
-    #
-    def parent(model, name)
-      Typus::Configuration.config[model.name][name] || ''
-    end
-
     def models
       Typus::Configuration.config.map { |i| i.first }.sort
     end

data/test/functional/admin/posts_controller_test.rb

@@ -244,15 +244,17 @@ class Admin::PostsControllerTest < ActionController::TestCase
 
   def test_should_verify_editor_cannot_edit_other_users_records
 
+    @request.env['HTTP_REFERER'] = '/admin/posts'
+
     typus_user = typus_users(:editor)
     @request.session[:typus_user_id] = typus_user.id
 
     post = posts(:owned_by_admin)
     get :edit, { :id => post.id }
     assert_response :redirect
-    assert_redirected_to :action => 'show', :id => post.id
+    assert_redirected_to '/admin/posts'
     assert flash[:notice]
-    assert_equal "Record owned by another user.", flash[:notice]
+    assert_equal "You don't have permission to access this item.", flash[:notice]
 
   end
 

data/test/functional/typus_controller_test.rb

@@ -260,7 +260,7 @@ class TypusControllerTest < ActionController::TestCase
     assert_match "href=\"\/admin\/typus_users\/edit\/#{typus_user.id}\"", @response.body
 
     assert_select 'body div#header' do
-      assert_select 'a', 'Admin Example (admin)'
+      assert_select 'a', 'Admin Example'
       assert_select 'a', 'Sign out'
     end
 

data/test/helpers/admin/form_helper_test.rb

@@ -239,8 +239,8 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 <a name="comments"></a>
 <div class="box_relationships">
   <h2>
-  <a href="http://test.host/admin/comments">Comments</a>
-  <small><a href="http://test.host/admin/comments/new?resource=post&resource_id=1">Add new</a></small>
+  <a href="http://test.host/admin/comments" title="Comments filtered by Post#1">Comments</a>
+  <small><a href="http://test.host/admin/comments/new?back_to=%23comments&resource=post&resource_id=1">Add new</a></small>
   </h2>
 <!-- a_nice_list --></div>
     HTML
@@ -264,8 +264,8 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 <a name="comments"></a>
 <div class="box_relationships">
   <h2>
-  <a href="http://test.host/admin/comments">Comments</a>
-  <small><a href="http://test.host/admin/comments/new?resource=post&resource_id=1">Add new</a></small>
+  <a href="http://test.host/admin/comments" title="Comments filtered by Post#1">Comments</a>
+  <small><a href="http://test.host/admin/comments/new?back_to=%23comments&resource=post&resource_id=1">Add new</a></small>
   </h2>
   <div id="flash" class="notice"><p>There are no comments.</p></div>
 </div>

data/test/helpers/admin/master_helper_test.rb

@@ -9,7 +9,11 @@ class Admin::MasterHelperTest < ActiveSupport::TestCase
 
   def test_display_link_to_previous
 
-    output = display_link_to_previous(Post, { :action => 'edit', :back_to => '/back_to_param' })
+    @resource = { :class => Post }
+    params = { :action => 'edit', :back_to => '/back_to_param' }
+    self.expects(:params).at_least_once.returns(params)
+
+    output = display_link_to_previous
     expected = <<-HTML
 <div id="flash" class="notice">
   <p>You're updating a Post. <a href="/back_to_param">Do you want to cancel it?</a></p>

data/test/helpers/admin/sidebar_helper_test.rb

@@ -18,8 +18,6 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
     self.expects(:default_actions).returns(['action1', 'action2'])
     self.expects(:previous_and_next).returns(['previous', 'next'])
     self.expects(:export).returns(['csv', 'pdf'])
-    self.expects(:modules).with('parent_module').returns(['parent_module'])
-    self.expects(:modules).with('submodules').returns(['submodules'])
 
     output = actions
     expected = <<-HTML
@@ -39,16 +37,6 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
 <ul>
 <li>csv</li>
 <li>pdf</li>
-</ul>
-
-<h2>Parent module</h2>
-<ul>
-<li>parent_module</li>
-</ul>
-
-<h2>Submodules</h2>
-<ul>
-<li>submodules</li>
 </ul>
 
     HTML
@@ -100,10 +88,6 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
     assert_no_match /\/h2/, output
   end
 
-  def test_modules
-    assert true
-  end
-
   def test_previous_and_next
 
     params = { :controller => 'admin/typus_users', :action => 'index' }

data/test/lib/typus_test.rb

@@ -37,25 +37,6 @@ class TypusTest < ActiveSupport::TestCase
     assert_equal %w( Comment Post ), Typus.application('Blog')
   end
 
-  def test_should_return_modules_of_a_module
-    assert Typus.respond_to?(:module)
-    assert_equal %w( Category ), Typus.module(Post)
-  end
-
-  def test_should_verify_parent_exists
-    assert Typus.respond_to?(:parent)
-  end
-
-  def test_should_verify_parent_for_application
-    assert Typus.parent(TypusUser, 'application').kind_of?(String)
-    assert_equal 'Typus', Typus.parent(TypusUser, 'application')
-  end
-
-  def test_should_verify_parent_for_nothing
-    assert Typus.parent(TypusUser, 'nothing').kind_of?(String)
-    assert_equal '', Typus.parent(TypusUser, 'nothing')
-  end
-
   def test_should_return_models_and_should_be_sorted
     assert Typus.respond_to?(:models)
     assert Typus.models.kind_of?(Array)

data/test/unit/typus_user_test.rb

@@ -121,16 +121,14 @@ this_is_chelm@example.com
     assert_equal "can't be blank", @typus_user.errors[:role]
   end
 
-  def test_should_return_full_name
-    assert_equal "#{@typus_user.email} (#{@typus_user.role})", @typus_user.full_name(:display_role => true)
-    assert_equal "#{@typus_user.email}", @typus_user.full_name
+  def test_should_return_name_when_only_email
+    assert_equal @typus_user.email, @typus_user.name
   end
 
-  def test_should_return_full_name_with_role
+  def test_should_return_name_when_theres_first_name_and_last_name
     @typus_user.first_name = 'John'
     @typus_user.last_name = 'Smith'
-    assert_equal "John Smith (#{@typus_user.role})", @typus_user.full_name(:display_role => true)
-    assert_equal 'John Smith', @typus_user.full_name
+    assert_equal 'John Smith', @typus_user.name
   end
 
   def test_should_return_verify_is_root

data/typus.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typus}
-  s.version = "0.9.7"
+  s.version = "0.9.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesc Esplugas"]
-  s.date = %q{2009-06-07}
+  s.date = %q{2009-06-11}
   s.description = %q{Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)}
   s.email = %q{francesc@intraducibles.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fesplugas-typus
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-07 00:00:00 -07:00
+date: 2009-06-11 00:00:00 -07:00
 default_executable: 
 dependencies: []