typus 1.0.0.pre8 → 1.0.0.pre9

data/CHANGELOG

@@ -68,6 +68,10 @@
 [X] Search fields now support exact match, beginning of the field and
     full-text match which is the default.
 [X] Do not depend on Rdiscount when rendering content on resources#show.
+[X] Decide where to put the search box.
+[X] Pagination doesn't work properly when having multiple paginators on edit page
+[X] Generator to copy views to `app/views/admin`.
+[X] Clicking on h1 should open website (root_path) when available.
 
 [-] Move html code from helpers to partials.
 [ ] Add `has_many` through relationships.
@@ -79,16 +83,13 @@
 [ ] Show auto_generated, read_only on string fields. (_string.html.erb)
 [ ] Pass options hash to form fields.
 [ ] Fix css to display correctly "select" fields in relationships.
-[ ] Ajax pagination. (?)
 [ ] Add test for `typus_table_selector`.
 [ ] Forever loop when schema has not been migrated.
-[ ] Pagination doesn't work properly when having multiple paginators on edit page
 [ ] Add support for `has_one` relationships.
 [ ] Remove all crappy rescues.
 [ ] Search in multiple models.
 [ ] Nested models.
 [ ] Contextual content depending on the logged user.
-[ ] Include dashboard#sidebar in the generator so use can easily overwrite it.
 [ ] Verify generator is working properly.
 [ ] Test generator?
 [ ] Added comment on all FIXME tests. Try to fix them first.
@@ -97,8 +98,5 @@
 [ ] Convert plugin to engine.
 [ ] Verify lightbox is working as expected.
 [ ] Fix footer to the bottom.
-[ ] Show sort arrow on hover.
-[ ] Clicking on h1 should open website (root_path) when available.
 [ ] `Typus.applications` should become `Typus.groups`.
-[ ] Decide where to put the search box.
 [ ] Removing an item should redirect to back without the page params.

data/Gemfile

@@ -1,17 +1,20 @@
 source 'http://rubygems.org'
 
-# gemspec
-
-gem "rails", "3.0.0"
-gem "fastercsv", "1.5.3"
-
-gem "sqlite3-ruby"
-gem "mysql"
-gem "pg"
-gem "factory_girl"
-gem "acts_as_tree"
 gem "acts_as_list"
+gem "acts_as_tree"
 gem "paperclip"
-gem "shoulda"
-gem "mocha"
-gem 'leftright'
+gem "fastercsv", "1.5.3" unless RUBY_VERSION >= '1.9'
+gem "paginator", "1.1.1"
+
+group :test do
+  gem "capybara"
+  gem "factory_girl"
+  gem "mysql"
+  gem "paperclip"
+  gem "pg"
+  gem "rails", "3.0.0"
+  gem "shoulda"
+  gem "sqlite3-ruby"
+
+  gem "mocha"
+end

data/Gemfile.lock

@@ -33,12 +33,25 @@ GEM
     arel (1.0.1)
       activesupport (~> 3.0.0)
     builder (2.1.2)
+    capybara (0.3.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.3)
+    culerity (0.2.12)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     factory_girl (1.3.2)
     fastercsv (1.5.3)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    hoe (2.6.2)
+      rake (>= 0.8.7)
+      rubyforge (>= 2.0.4)
     i18n (0.4.1)
-    leftright (0.0.6)
+    json_pure (1.4.6)
     mail (2.2.5)
       activesupport (>= 2.3.6)
       mime-types
@@ -47,6 +60,9 @@ GEM
     mocha (0.9.8)
       rake
     mysql (2.8.1)
+    nokogiri (1.4.3.1)
+    paginator (1.1.1)
+      hoe (>= 1.6.0)
     paperclip (2.3.3)
       activerecord
       activesupport
@@ -71,6 +87,13 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.0.28)
+      ffi (>= 0.6.1)
+      json_pure
+      rubyzip
     shoulda (2.11.3)
     sqlite3-ruby (1.3.1)
     thor (0.14.0)
@@ -84,11 +107,12 @@ PLATFORMS
 DEPENDENCIES
   acts_as_list
   acts_as_tree
+  capybara
   factory_girl
   fastercsv (= 1.5.3)
-  leftright
   mocha
   mysql
+  paginator (= 1.1.1)
   paperclip
   pg
   rails (= 3.0.0)

data/Rakefile

@@ -36,10 +36,9 @@ task :release => :build do
 
   system "git commit -m 'Bump version to #{Typus::VERSION}' lib/typus/version.rb"
   system "git tag v#{version}"
-  system "git push"
-  system "git push --tags"
+  system "git push && git push --tags"
 
   system "gem push typus-#{version}.gem"
 
-  system "git clean -fd"
+  system "git clean -fd && rm -f typus-#{version}.gem"
 end

data/app/controllers/admin/base_controller.rb

@@ -1,20 +1,18 @@
-require "typus/authentication"
-
 class Admin::BaseController < ActionController::Base
 
-  unloadable
+  include Typus::Authentication::const_get(Typus.authentication.to_s.classify)
 
   before_filter :reload_config_and_roles
   before_filter :authenticate
 
+  helper_method :current_user
+
   protected
 
   def reload_config_and_roles
     Typus.reload! unless Rails.env.production?
   end
 
-  include Typus::Authentication
-
   def set_path
     @back_to || request.referer || admin_dashboard_path
   end

data/app/controllers/admin/resources_controller.rb

@@ -26,11 +26,10 @@ class Admin::ResourcesController < Admin::BaseController
                 :only => [ :index, :new, :edit, :create, :update, :show ]
 
   ##
-  # This is the main index of the model. With filters, conditions
-  # and more.
+  # This is the main index of the model. With filters, conditions and more.
   #
-  # By default application can respond_to html, csv and xml, but you
-  # can add your formats.
+  # By default application can respond_to html, csv and xml, but you can add
+  # your formats.
   #
   def index
     @conditions, @joins = @resource.build_conditions(params)
@@ -55,9 +54,9 @@ class Admin::ResourcesController < Admin::BaseController
   end
 
   ##
-  # Create new items. There's an special case when we create an
-  # item from another item. In this case, after the item is
-  # created we also create the relationship between these items.
+  # Create new items. There's an special case when we create an item from
+  # another item. In this case, after the item is created we also create the
+  # relationship between these items.
   #
   def create
     @item = @resource.new(params[@object_name])
@@ -110,13 +109,12 @@ class Admin::ResourcesController < Admin::BaseController
   end
 
   ##
-  # Change item position. This only works if acts_as_list is
-  # installed. We can then move items:
+  # Change item position. This only works if acts_as_list is installed. We can
+  # then move items:
   #
   #   params[:go] = 'move_to_top'
   #
-  # Available positions are move_to_top, move_higher, move_lower,
-  # move_to_bottom.
+  # Available positions are move_to_top, move_higher, move_lower, move_to_bottom.
   #
   def position
     @item.send(params[:go])
@@ -156,20 +154,24 @@ class Admin::ResourcesController < Admin::BaseController
 
     # We consider that we are unrelating a has_many or has_and_belongs_to_many
 
-    macro = @resource.reflect_on_association(resource_class.table_name.to_sym).try(:macro)
+    reflection = @resource.reflect_on_association(resource_class.table_name.to_sym)
+    macro = reflection.try(:macro)
+    options = reflection.try(:options)
 
     case macro
     # when :has_one
     #   attribute = resource_tableized.singularize
     #   saved_succesfully = @item.update_attribute attribute, nil
     when :has_many
-      ##
-      # We have to verify we can unrelate. For example: A Category which
-      # has many posts and Post validates_presence_of Category should not
-      # be removed.
-      #
-      attribute = @resource.table_name.singularize
-      saved_succesfully = resource.update_attributes(attribute => nil)
+      if options.has_key?(:as) # We are in a polymorphic relationship
+        interface = options[:as]
+        saved_succesfully = resource.update_attributes("#{interface}_type" => nil, "#{interface}_id" => nil)
+      else
+        # We have to verify we can unrelate. For example: A Category which has
+        # many posts and Post validates_presence_of Category should not be removed.
+        attribute = @resource.table_name.singularize
+        saved_succesfully = resource.update_attributes(attribute => nil)
+      end
     when :has_and_belongs_to_many
       attribute = resource_tableized
       saved_succesfully = @item.send(attribute).delete(resource)
@@ -214,10 +216,6 @@ class Admin::ResourcesController < Admin::BaseController
     @object_name = ActiveModel::Naming.singular(@resource)
   end
 
-  ##
-  # Find model when performing an edit, update, destroy, relate,
-  # unrelate ...
-  #
   def get_object
     @item = @resource.find(params[:id])
   end
@@ -299,9 +297,9 @@ class Admin::ResourcesController < Admin::BaseController
 
   end
 
-  def select_template(template = params[:action], resource = @resource.to_resource)
-    folder = (File.exist?("app/views/admin/#{resource}/#{template}.html.erb")) ? resource : 'resources'
-    render "admin/#{folder}/#{template}"
+  def select_template(action = params[:action], resource = @resource.to_resource)
+    folder = File.exist?("app/views/admin/#{resource}/#{action}.html.erb") ? resource : 'resources'
+    render "admin/#{folder}/#{action}"
   end
 
 end

data/app/helpers/admin/base_helper.rb

@@ -2,22 +2,14 @@ module Admin
 
   module BaseHelper
 
-    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
+    def typus_render(*args)
+      options = args.extract_options!
+      options[:resource] ||= @resource.to_resource
+
+      template_file = Rails.root.join("app", "views", "admin", options[:resource], "_#{options[:partial]}.html.erb")
+      resource = File.exists?(template_file) ? options[:resource] : "resources"
+
+      render "admin/#{resource}/#{options[:partial]}", :options => options
     end
 
     def title(page_title)
@@ -32,19 +24,19 @@ module Admin
       render "admin/helpers/apps"
     end
 
-    def login_info(user = @current_user)
-      return if user.kind_of?(Admin::FakeUser)
+    def login_info
+      return if [:none, :http_basic].include?(Typus.authentication)
 
       admin_edit_typus_user_path = { :controller => "/admin/#{Typus.user_class.to_resource}",
                                      :action => 'edit',
-                                     :id => user.id }
+                                     :id => current_user.id }
 
       message = _t("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
+      user_details = if current_user.can?('edit', Typus.user_class_name)
+                       link_to current_user.name, admin_edit_typus_user_path
                      else
-                       user.name
+                       current_user.name
                      end
 
       render "admin/helpers/login_info", :message => message, :user_details => user_details

data/app/helpers/admin/dashboard_helper.rb

@@ -6,13 +6,10 @@ module Admin
       render File.join(path, "applications")
     end
 
-    def resources
+    def resources(current_user)
       available = Typus.resources.map do |resource|
-                    resource if @current_user.resources.include?(resource)
+                    resource if current_user.resources.include?(resource)
                   end.compact
-
-      return if available.empty?
-
       render File.join(path, "resources"), :resources => available
     end
 

data/app/helpers/admin/filters_helper.rb

@@ -3,8 +3,8 @@ module Admin
   module FiltersHelper
 
     def build_filters(resource = @resource)
-
       typus_filters = resource.typus_filters
+
       return if typus_filters.empty?
 
       current_request = request.env['QUERY_STRING'] || []
@@ -23,8 +23,10 @@ module Admin
                                    string_filter(current_request, key)
                                  end
 
-        { :filter => filter, :items => items, :message => message }
+        items = items.to_a
+        items.insert(0, [message, ""])
 
+        { :filter => filter, :items => items }
       end
 
       render "admin/helpers/filters/filters", :filters => filters
@@ -40,10 +42,7 @@ module Admin
       %w(controller action page).each { |p| params_without_filter.delete(p) }
       params_without_filter.delete(related_fk)
 
-      values = model.all(:order => model.typus_order_by)
-      values_labelized = values.map { |v| v.to_label }
-      items = values.map(&:id).to_hash_with(values_labelized)
-
+      items = model.all(:order => model.typus_order_by).collect{|v| [v.to_label, v.id] }
       message = _t("View all %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase.pluralize)
 
       return related_fk, items, message
@@ -51,8 +50,7 @@ module Admin
 
     def date_filter(request, filter)
       values  = %w(today last_few_days last_7_days last_30_days)
-      values_humanized = values.map { |v| _t(v.humanize) }
-      items   = values.to_hash_with(values_humanized)
+      items = values.collect {|v| [_t(v.humanize), v ] }
       message = _t("Show all dates")
       return filter, items, message
     end

data/app/helpers/admin/form_helper.rb

@@ -28,14 +28,6 @@ module Admin
       return html
     end
 
-    def form_partial
-      resource = @resource.to_resource
-      template_file = Rails.root.join("app/views/admin/#{resource}/_form.html.erb")
-      partial = File.exists?(template_file) ? resource : "resources"
-
-      return "admin/#{partial}/form"
-    end
-
     def typus_tree_field(attribute, form)
       render "admin/templates/tree",
              :attribute => attribute,
@@ -55,7 +47,7 @@ module Admin
 
         association = @resource.reflect_on_association(relationship.to_sym)
 
-        next if @current_user.cannot?('read', association.class_name.constantize)
+        next if current_user.cannot?('read', association.class_name.constantize)
 
         case association.macro
         when :has_and_belongs_to_many
@@ -95,6 +87,8 @@ module Admin
     end
 
 =begin
+
+    # TODO: Take `attribute_disabled?(attribute)` back.
     def attribute_disabled?(attribute)
       accessible = @resource.accessible_attributes
       return accessible.nil? ? false : !accessible.include?(attribute)

data/app/helpers/admin/preview_helper.rb

@@ -14,13 +14,11 @@ module Admin
         return link
       end
 
-      file = { :preview => Typus.file_preview, :thumbnail => Typus.file_thumbnail }
-
-      has_file_preview = item.send(attribute).styles.member?(file[:preview])
-      has_file_thumbnail = item.send(attribute).styles.member?(file[:thumbnail])
+      has_file_preview = item.send(attribute).styles.member?(Typus.file_preview)
+      has_file_thumbnail = item.send(attribute).styles.member?(Typus.file_thumbnail)
 
       href = if has_file_preview && file_preview_is_image
-               url = item.send(attribute).url(file[:preview])
+               url = item.send(attribute).url(Typus.file_preview)
                # FIXME: This has changed on Rails3.
                # ActionController::Base.relative_url_root + url
              else
@@ -28,7 +26,7 @@ module Admin
              end
 
       content = if has_file_thumbnail && file_preview_is_image
-                  image_tag item.send(attribute).url(file[:thumbnail])
+                  image_tag item.send(attribute).url(Typus.file_thumbnail)
                 else
                   item.send(attribute)
                 end