typus 0.9.35 → 0.9.36

data/CONTRIBUTORS

@@ -0,0 +1,18 @@
+- Laia Gargallo (Lover and tea provider) http://azotacalles.net
+- Isaac Feliu (Codereview on first public release) http://www.vesne.com
+- Lluis Folch (Icons, feedback & crazy ideas) http://wet-floor.com
+- Sergio Espeja (Code) http://github.com/spejman
+- Eadz (Code) http://github.com/eadz
+- Anthony Underwood (Code) http://github.com/aunderwo
+- Felipe Talavera (Code) http://github.com/flype
+- Erik Tigerholm (Code) http://github.com/eriktigerholm
+- George Guimarães (Portuguese translation and code) http://github.com/georgeguimaraes
+- José Valim (Code) http://github.com/josevalim
+- Luqman Amjad (Code) http://github.com/luqman
+- Alexey Noskov (Russian translation and code) http://github.com/alno
+- Andres Gutierres (Bugfixes & feedback) http://github.com/andresgutgon
+- Komzák Nándor (Code, bugfixes & feedback) http://github.com/rubymood
+- Michael Grunewalder (German translation) http://michael.grunewalder.com
+- Tim Harvey (Code) http://www.timharvey.net/ 
+- Ned Baldessin (French translation and code) http://github.com/nedbaldessin
+- Robert Rouse (Code) - Ruby 1.9 compatibility fixes.

data/HISTORY.md

@@ -0,0 +1,3 @@
+## 0.9.37 (2009-??-??)
+
+* Added contributors file.

data/README.rdoc

@@ -8,9 +8,10 @@
 extensible enough to match lots of use cases.
 
 - Project site and documentation http://intraducibles.com/projects/typus
-- Plugin source http://github.com/fesplugas/typus/tree
-- Google Group http://groups.google.es/group/typus
-- Bugs http://typus.lighthouseapp.com/dashboard
+- Plugin source http://github.com/fesplugas/typus
+- Google Group http://groups.google.com/group/typus
+- Bugs http://github.com/fesplugas/typus/issues
+- Gems: http://gemcutter.org/gems/typus
 
 == Impatients to see it working?
 
@@ -82,27 +83,6 @@ If you are using *Typus* as a gem add the following line at the end of the
 
     Dir["#{RAILS_ROOT}/vendor/gems/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
 
-== Contributors
-
-- Laia Gargallo (Lover and tea provider) http://azotacalles.net
-- Isaac Feliu (Codereview on first public release) http://www.vesne.com
-- Lluis Folch (Icons, feedback & crazy ideas) http://wet-floor.com
-- Sergio Espeja (Code) http://github.com/spejman
-- Eadz (Code) http://github.com/eadz
-- Anthony Underwood (Code) http://github.com/aunderwo
-- Felipe Talavera (Code) http://github.com/flype
-- Erik Tigerholm (Code) http://github.com/eriktigerholm
-- George Guimarães (Portuguese translation and code) http://github.com/georgeguimaraes
-- José Valim (Code) http://github.com/josevalim
-- Luqman Amjad (Code) http://github.com/luqman
-- Alexey Noskov (Russian translation and code) http://github.com/alno
-- Andres Gutierres (Bugfixes & feedback) http://github.com/andresgutgon
-- Komzák Nándor (Code, bugfixes & feedback) http://github.com/rubymood
-- Michael Grunewalder (German translation) http://michael.grunewalder.com
-- Tim Harvey (Code) http://www.timharvey.net/ 
-- Ned Baldessin (French translation and code) http://github.com/nedbaldessin
-- Robert Rouse (Code) - Ruby 1.9 compatibility fixes.
-
 == Acknowledgments
 
 - *Typus* uses "Paginator" by Bruce Williams http://codefluency.com.

data/Rakefile

@@ -1,6 +1,5 @@
-require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+# require 'rake/rdoctask'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -12,17 +11,6 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-desc 'Generate documentation for the typus plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_files.add ['README.rdoc', 'MIT-LICENSE', 'lib/**/*.rb']
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Typus documentation'
-  rdoc.main = 'README.rdoc'
-  rdoc.options << '--charset=UTF-8'
-  rdoc.options << '--inline-source'
-  rdoc.options << '--line-numbers'
-end
-
 desc 'Generate specdoc-style documentation from tests'
 task :specs do
 
@@ -48,6 +36,8 @@ end
 
 begin
   require 'jeweler'
+  $LOAD_PATH.unshift 'lib'
+  require 'typus/version'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "typus"
     gemspec.summary = "Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)"
@@ -55,7 +45,38 @@ begin
     gemspec.homepage = "http://intraducibles.com/projects/typus"
     gemspec.description = "Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)"
     gemspec.authors = ["Francesc Esplugas"]
+    # gemspec.version = Typus::Version
+    gemspec.version = "1223"
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler -s http://gemcutter.org"
+  puts "Jeweler not available."
+  puts "Install it with: gem install jeweler -s http://gemcutter.org"
+end
+
+begin
+  require 'sdoc_helpers'
+rescue LoadError
+  puts "sdoc support not enabled. Please gem install sdoc-helpers."
+end
+
+desc "Push a new version to Gemcutter"
+task :publish => [ :gemspec, :build ] do
+  system "git tag v#{Typus::Version}"
+  system "git push origin v#{Typus::Version}"
+  system "gem push pkg/typus-#{Typus::Version}.gem"
+  system "git clean -fd"
+  exec "rake pages"
+end
+
+desc "Install the edge gem"
+task :install_edge => [ :dev_version, :gemspec, :build ] do
+  exec "gem install pkg/typus-#{Typus::Version}.gem"
+end
+
+# Sets the current Typus version to the current dev version
+task :dev_version do
+  $LOAD_PATH.unshift 'lib'
+  require 'typus/version'
+  version = Typus::Version + '.' + Time.now.to_i.to_s
+  Typus.const_set(:Version, version)
 end

data/VERSION

@@ -1 +1 @@
-0.9.35
+0.9.36

data/app/controllers/admin/master_controller.rb

@@ -98,7 +98,7 @@ class Admin::MasterController < ApplicationController
     if @item.valid?
       create_with_back_to and return if params[:back_to]
       @item.save
-      flash[:success] = _("{{model}} successfully created.", :model => @resource[:class].typus_human_name)
+      flash[:success] = _("{{model}} successfully created.", :model => @resource[:human_name])
       if @resource[:class].typus_options_for(:index_after_save)
         redirect_to :action => 'index'
       else
@@ -149,7 +149,7 @@ class Admin::MasterController < ApplicationController
         @item.update_attributes Typus.user_fk => @current_user.id
       end
 
-      flash[:success] = _("{{model}} successfully updated.", :model => @resource[:class].typus_human_name)
+      flash[:success] = _("{{model}} successfully updated.", :model => @resource[:human_name])
       path = if @resource[:class].typus_options_for(:index_after_save)
                params[:back_to] ? "#{params[:back_to]}##{@resource[:self]}" : { :action => 'index' }
              else
@@ -168,7 +168,7 @@ class Admin::MasterController < ApplicationController
 
   def destroy
     @item.destroy
-    flash[:success] = _("{{model}} successfully removed.", :model => @resource[:class].typus_human_name)
+    flash[:success] = _("{{model}} successfully removed.", :model => @resource[:human_name])
     redirect_to request.referer || admin_dashboard_path
   rescue Exception => error
     error_handler(error, params.merge(:action => 'index', :id => nil))
@@ -178,7 +178,7 @@ class Admin::MasterController < ApplicationController
     if @resource[:class].typus_options_for(:toggle)
       @item.toggle!(params[:field])
       flash[:success] = _("{{model}} {{attribute}} changed.", 
-                          :model => @resource[:class].typus_human_name, 
+                          :model => @resource[:human_name], 
                           :attribute => params[:field].humanize.downcase)
     else
       flash[:notice] = _("Toggle is disabled.")
@@ -214,7 +214,7 @@ class Admin::MasterController < ApplicationController
 
     flash[:success] = _("{{model_a}} related to {{model_b}}.", 
                         :model_a => resource_class.typus_human_name, 
-                        :model_b => @resource[:class].typus_human_name)
+                        :model_b => @resource[:human_name])
 
     redirect_to :back
 
@@ -240,7 +240,7 @@ class Admin::MasterController < ApplicationController
 
     flash[:success] = _("{{model_a}} unrelated from {{model_b}}.", 
                         :model_a => resource_class.typus_human_name, 
-                        :model_b => @resource[:class].typus_human_name)
+                        :model_b => @resource[:human_name])
 
     redirect_to :back
 
@@ -249,8 +249,9 @@ class Admin::MasterController < ApplicationController
 private
 
   def set_resource
-    resource = params[:controller].split('/').last
-    @resource = { :self => resource, :class => resource.classify.constantize }
+    @resource = { :self => params[:controller].extract_resource, 
+                  :human_name => params[:controller].extract_human_name, 
+                  :class => params[:controller].extract_class }
   rescue Exception => error
     error_handler(error)
   end
@@ -305,7 +306,7 @@ private
     klass = params[:resource].classify.constantize
     return if !klass.typus_user_id?
     item = klass.find(params[:resource_id])
-    raise "You're not owner of this record." unless item.owned_by?(@current_user)
+    raise "You're not owner of this record." unless item.owned_by?(@current_user) || @current_user.is_root?
   end
 
   def set_fields
@@ -370,7 +371,7 @@ private
       @item.send(params[:resource]) << resource
     when :has_many
       @item.save
-      message = _("{{model}} successfully created.", :model => @resource[:class].typus_human_name)
+      message = _("{{model}} successfully created.", :model => @resource[:human_name])
       path = "#{params[:back_to]}?#{params[:selected]}=#{@item.id}"
     when :polymorphic
       resource.send(@item.class.name.tableize).create(params[:item])

data/app/helpers/admin/master_helper.rb

@@ -9,7 +9,7 @@ module Admin::MasterHelper
   def display_link_to_previous
 
     options = {}
-    options[:resource_from] = @resource[:class].typus_human_name
+    options[:resource_from] = @resource[:human_name]
     options[:resource_to] = params[:resource].classify.humanize if params[:resource]
 
     editing = %w( edit update ).include?(params[:action])

data/app/helpers/admin/table_helper.rb

@@ -75,7 +75,7 @@ module Admin::TableHelper
                                         :title => _("Unrelate"), 
                                         :confirm => _("Unrelate {{unrelate_model}} from {{unrelate_model_from}}?", 
                                         :unrelate_model => model.typus_human_name, 
-                                        :unrelate_model_from => @resource[:class].typus_human_name)
+                                        :unrelate_model_from => @resource[:human_name])
         when 'show'
           # If we are showing content, we only can relate and unrelate if we are 
           # the owners of the owner record.
@@ -88,7 +88,7 @@ module Admin::TableHelper
                                         :title => _("Unrelate"), 
                                         :confirm => _("Unrelate {{unrelate_model}} from {{unrelate_model_from}}?", 
                                         :unrelate_model => model.typus_human_name, 
-                                        :unrelate_model_from => @resource[:class].typus_human_name) if condition
+                                        :unrelate_model_from => @resource[:human_name]) if condition
         end
 
         html << <<-HTML
@@ -167,7 +167,7 @@ module Admin::TableHelper
 
   def typus_table_string_field(attribute, item, link_options = {})
     <<-HTML
-<td class="#{attribute}">#{item.send(attribute)}</td>
+<td class="#{attribute}">#{h(item.send(attribute))}</td>
     HTML
   end
 

data/app/helpers/typus_helper.rb

@@ -25,13 +25,14 @@ module TypusHelper
 
           klass = model.constantize
           klass_resource = klass.name.tableize
+          klass_human_name = klass.typus_human_name.gsub('/', ' ').pluralize
 
           admin_items_path = { :controller => "admin/#{klass_resource}" }
           new_admin_item_path = { :controller => "admin/#{klass_resource}", :action => 'new'}
 
           html << <<-HTML
 <tr class="#{cycle('even', 'odd')}">
-<td>#{link_to klass.typus_human_name.pluralize, admin_items_path}<br /><small>#{_(klass.typus_description) if !klass.typus_description.nil?}</small></td>
+<td>#{link_to klass_human_name, admin_items_path}<br /><small>#{_(klass.typus_description) if !klass.typus_description.nil?}</small></td>
 <td class="right"><small>
 #{link_to _("Add"), new_admin_item_path if @current_user.can_perform?(klass, 'create')}
 </small></td>
@@ -114,7 +115,7 @@ module TypusHelper
 
   def page_title(action = params[:action])
     crumbs = [ ]
-    crumbs << @resource[:class].typus_human_name.pluralize if @resource
+    crumbs << @resource[:human_name].pluralize if @resource
     crumbs << _(action.humanize) unless %w( index ).include?(action)
     return "#{Typus::Configuration.options[:app_name]} - " + crumbs.compact.map { |x| x }.join(' &rsaquo; ')
   end

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

@@ -7,7 +7,7 @@
 
 <%= display_link_to_previous if params[:back_to] %>
 
-<h2><%= link_to @resource[:class].typus_human_name.pluralize, :action => 'index' %> &rsaquo;
+<h2><%= link_to @resource[:human_name].pluralize, :action => 'index' %> &rsaquo;
     <%= _("Edit") %></h2>
 
 <%= typus_block :location => @resource[:self], :partial => 'edit' %>

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

@@ -6,7 +6,7 @@
   <%= filters %>
 <% end %>
 
-<h2><%= @resource[:class].typus_human_name.pluralize %> <%= remove_filter_link %></h2>
+<h2><%= @resource[:human_name].pluralize %> <%= remove_filter_link %></h2>
 
 <%= typus_block :location => @resource[:self], :partial => 'index' %>
 
@@ -16,9 +16,9 @@
 <% else %>
   <div id="flash" class="notice">
     <% if @resource[:class].count.zero? %>
-      <p><%= _("There are no {{records}}.", :records => @resource[:class].typus_human_name.pluralize.downcase) %></p>
+      <p><%= _("There are no {{records}}.", :records => @resource[:human_name].pluralize.downcase) %></p>
     <% else %>
-      <p><%= _("There are no {{records}} under this filter.", :records => @resource[:class].typus_human_name.pluralize.downcase) %></p>
+      <p><%= _("There are no {{records}} under this filter.", :records => @resource[:human_name].pluralize.downcase) %></p>
     <% end %>
   </div>
 <% end %>

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

@@ -5,7 +5,7 @@
 
 <%= display_link_to_previous if params[:back_to] %>
 
-<h2><%= link_to @resource[:class].typus_human_name.pluralize, :action => 'index' %> &rsaquo; 
+<h2><%= link_to @resource[:human_name].pluralize, :action => 'index' %> &rsaquo; 
     <%= _("New") %></h2>
 
 <%= typus_block :location => @resource[:self], :partial => 'new' %>

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

@@ -5,7 +5,7 @@
   <%= previous_and_next %>
 <% end %>
 
-<h2><%= link_to @resource[:class].typus_human_name.pluralize, :action => 'index' %> &rsaquo; 
+<h2><%= link_to @resource[:human_name].pluralize, :action => 'index' %> &rsaquo; 
     <%= _("Show") %></h2>
 
 <%= typus_block :location => @resource[:self], :partial => 'show' %>

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

@@ -2,6 +2,8 @@ This is an example of a **Typus** enabled model with all available
 options. You can use this example to customize your YAML files which 
 only have set the most common settings.
 
+Note: To define namespace models use :: as a separator. (i.e. Delayed::Job)
+
     Post:
       fields:
         list: id, title, category_id, created_at, is_published?

data/generators/typus/templates/public/stylesheets/admin/screen.css

@@ -354,7 +354,7 @@ input#search { border: 1px solid #999; font-size: 1.2em; padding: 3px; }
 
 /* @group Sprite */
 
-.sprite { background: url(/images/admin/ui-icons.png) no-repeat; text-indent: -1000px; }
+.sprite { background: url(/images/admin/ui-icons.png) no-repeat; text-indent: -10000px; }
 .trash { background-position: -177px -97px; height: 15px; width: 15px; }
 .unrelate { background-position: -145px -129px; height: 15px; width: 15px; }
 

data/generators/typus/typus_generator.rb

@@ -1,5 +1,3 @@
-require 'ftools'
-
 class TypusGenerator < Rails::Generator::Base
 
   def manifest
@@ -21,7 +19,7 @@ class TypusGenerator < Rails::Generator::Base
 
       # To create <tt>application.yml</tt> and <tt>application_roles.yml</tt> 
       # detect available AR models on the application.
-      models = Dir['app/models/*.rb'].collect { |x| File.basename(x).sub(/\.rb$/,'').camelize }
+      models = (Typus.discover_models + Typus.models).uniq
       ar_models = []
 
       models.each do |model|
@@ -146,15 +144,23 @@ class TypusGenerator < Rails::Generator::Base
       #   `app/controllers/admin/#{resource}_controller.rb`
       #   `test/functional/admin/#{resource}_controller_test.rb`
       #
-      Typus.models.each do |model|
+
+      ar_models << TypusUser
+      ar_models.each do |model|
+
+        folder = "admin/#{model.name.tableize}".split('/')[0...-1].join('/')
+
+        # Create needed folder.
+        [ "app/controllers/#{folder}", 
+          "test/functional/#{folder}"].each { |f| FileUtils.mkdir_p(f) unless File.directory?(f) }
 
         m.template "auto/resources_controller.rb.erb", 
-                   "app/controllers/admin/#{model.tableize}_controller.rb", 
-                   :assigns => { :model => model }
+                   "app/controllers/admin/#{model.name.tableize}_controller.rb", 
+                   :assigns => { :model => model.name }
 
         m.template "auto/resource_controller_test.rb.erb", 
-                   "test/functional/admin/#{model.tableize}_controller_test.rb", 
-                   :assigns => { :model => model }
+                   "test/functional/admin/#{model.name.tableize}_controller_test.rb", 
+                   :assigns => { :model => model.name }
 
       end
 

data/lib/typus.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module Typus
 
   class << self
@@ -28,6 +30,9 @@ module Typus
       Typus::Configuration.config.collect { |i| i.first if i.last['application'] == name }.compact.uniq.sort
     end
 
+    ##
+    # Gets a list of all the models on the configuration file.
+    #
     def models
       Typus::Configuration.config.map { |i| i.first }.sort
     end
@@ -36,20 +41,28 @@ module Typus
       models.collect { |m| m if m.constantize.typus_options_for(:on_header) }.compact
     end
 
+    ##
     # List of resources, which are tableless models.
-    def resources(models = get_model_names)
-
-      all_resources = Typus::Configuration.roles.keys.map do |key|
-                        Typus::Configuration.roles[key].keys
-                      end.flatten.sort.uniq
-
-      all_resources.delete_if { |x| models.include?(x) || x == 'TypusUser' } rescue []
-
+    #
+    def resources
+      Typus::Configuration.roles.keys.map do |key|
+        Typus::Configuration.roles[key].keys
+      end.flatten.sort.uniq.delete_if { |x| models.include?(x) }
     end
 
-    def get_model_names
-      Dir[ "#{Rails.root}/app/models/**/*.rb", 
-           "#{Rails.root}/vendor/plugins/**/app/models/**/*.rb" ].collect { |m| File.basename(m).sub(/\.rb$/,'').camelize }
+    ##
+    # Gets a list of models under app/models
+    #
+    def discover_models
+      all_models = []
+      Dir.chdir(File.join(Rails.root, 'app/models')) do
+        Dir['**/*.rb'].each do |m|
+          class_name = m.sub(/\.rb$/,'').camelize
+          klass = class_name.split('::').inject(Object){ |klass,part| klass.const_get(part) }
+          all_models << "#{class_name}" if klass < ActiveRecord::Base && !klass.abstract_class?
+        end
+      end
+      return all_models
     end
 
     def user_class

data/lib/typus/active_record.rb

@@ -289,15 +289,19 @@ module Typus
 
       select = !klass.typus_user_id? ? klass.primary_key : "#{klass.primary_key}, #{Typus.user_fk}"
 
-      previous_ = klass.find :first, 
-                             :select => select, 
-                             :order => "#{klass.primary_key} DESC", 
-                             :conditions => previous_conditions
-
-      next_ = klass.find :first, 
-                         :select => select, 
-                         :order => "#{klass.primary_key} ASC", 
-                         :conditions => next_conditions
+      previous_ = klass.send(:with_exclusive_scope) do
+        klass.find :first,
+             :select => select,
+             :order => "#{klass.primary_key} DESC",
+             :conditions => previous_conditions
+      end
+
+      next_ = klass.send(:with_exclusive_scope) do
+        klass.find :first,
+             :select => select,
+             :order => "#{klass.primary_key} ASC",
+             :conditions => next_conditions
+      end
 
       return previous_, next_
 

data/lib/typus/format.rb

@@ -21,12 +21,24 @@ module Typus
 
     def generate_csv
 
-      require 'fastercsv'
-
       fields = @resource[:class].typus_fields_for(:csv).collect { |i| i.first }
-      csv_string = FasterCSV.generate do |csv|
-        csv << fields.map { |f| _(f.humanize) }
-        data.each { |i| csv << fields.map { |f| i.send(f) } }
+
+      require 'csv'
+      if CSV.const_defined?(:Reader)
+        # Old CSV version so we enable faster CSV.
+        begin
+          require 'fastercsv'
+        rescue Exception => error
+          raise error.message
+        end
+        csv = FasterCSV
+      else
+        csv = CSV
+      end
+
+      csv_string = csv.generate do |c|
+        c << fields.map { |f| _(f.humanize) }
+        data.each { |i| c << fields.map { |f| i.send(f) } }
       end
 
       filename = "#{Time.now.strftime("%Y%m%d%H%M%S")}_#{@resource[:self]}.csv"
@@ -34,8 +46,6 @@ module Typus
                :type => 'text/csv; charset=utf-8; header=present',
                :filename => filename)
 
-    rescue LoadError
-      render :text => _("FasterCSV is not installed.")
     end
 
     def generate_xml

data/lib/typus/preview.rb

@@ -45,18 +45,16 @@ module Typus
           HTML
         elsif send(attachment).styles.member?(file_thumbnail)
           <<-HTML
+<script type="text/javascript" charset="utf-8">
+  $(document).ready(function() { $("##{to_dom}").fancybox(); });
+</script>
 <a href="#{send(attachment).url}" title="#{typus_name}">
 <img src="#{send(attachment).url(file_thumbnail)}" />
         </a>
           HTML
         elsif send(attachment).styles.member?(file_preview)
           <<-HTML
-<script type="text/javascript" charset="utf-8">
-  $(document).ready(function() { $("##{to_dom}").fancybox(); });
-</script>
-<a id="#{to_dom}" href="#{send(attachment).url(file_preview)}" title="#{typus_name}">
-#{send(attribute)}
-        </a>
+<img src="#{send(attachment).url(file_preview)}" />
           HTML
         else
           <<-HTML

data/lib/typus/string.rb

@@ -1,5 +1,21 @@
 class String
 
+  def extract_controller(admin = 'admin')
+    split('/').delete_if { |i| i.eql?(admin) }
+  end
+
+  def extract_resource
+    extract_controller.join('/')
+  end
+
+  def extract_class
+    extract_controller.map { |i| i.capitalize }.join('::').classify.constantize
+  end
+
+  def extract_human_name
+    extract_class.typus_human_name.gsub('/', ' ')
+  end
+
   def typus_actions_for(filter)
     Typus::Configuration.config[self]['actions'][filter.to_s].split(', ') rescue []
   end

data/lib/typus/version.rb

@@ -0,0 +1,3 @@
+class Typus
+  Version = '0.9.36'
+end

data/test/config/working/application.yml

@@ -22,6 +22,13 @@ Comment:
   search: email, body
   application: Blog
 
+Delayed::Task:
+  fields:
+    list: name
+    form: name
+  search: name
+  application: System
+
 Page:
   fields:
     # Body field is overwrited from a Page class method.

data/test/config/working/application_roles.yml

@@ -2,6 +2,7 @@ admin:
   Asset: create, read, update, delete
   Category: create, read, update, delete
   Comment: create, read, update, delete
+  Delayed::Task: create, read, update, delete
   Git: index, commit
   Order:
   Page: create, read, update, delete, rebuild, rebuild_all

data/test/functional/admin/master_controller_posts_formats_test.rb

@@ -37,12 +37,6 @@ class Admin::PostsControllerTest < ActionController::TestCase
 
     assert @typus_user.is_root?
 
-    begin
-      require 'fastercsv'
-    rescue LoadError
-      return
-    end
-
     expected = <<-RAW
 Title,Status
 Owned by admin,false

data/test/helpers/admin/master_helper_test.rb

@@ -9,7 +9,7 @@ class Admin::MasterHelperTest < ActiveSupport::TestCase
 
   def test_display_link_to_previous
 
-    @resource = { :class => Post }
+    @resource = { :class => Post, :human_name => 'Post' }
     params = { :action => 'edit', :back_to => '/back_to_param' }
     self.expects(:params).at_least_once.returns(params)
 

data/test/helpers/admin/sidebar_helper_test.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'test/helper'
 
 class Admin::SidebarHelperTest < ActiveSupport::TestCase
@@ -13,10 +15,11 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
     default_url_options[:host] = 'test.host'
   end
 
-=begin
-
+  # FIXME
   def test_actions
 
+    return
+
     self.expects(:default_actions).returns(['action1', 'action2'])
     self.expects(:previous_and_next).returns(['previous', 'next'])
     self.expects(:export).returns(['csv', 'pdf'])
@@ -47,8 +50,6 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
 
   end
 
-=end
-
   def test_export
 
     @resource = { :class => Post }

data/test/lib/active_record_test.rb

@@ -341,7 +341,7 @@ class ActiveRecordTest < ActiveSupport::TestCase
   end
 
   def test_should_verify_previous_and_next
-    assert TypusUser.instance_methods.include?('previous_and_next')
+    assert TypusUser.instance_methods.map { |i| i.to_sym }.include?(:previous_and_next)
     assert typus_users(:admin).previous_and_next.kind_of?(Array)
   end
 

data/test/lib/string_test.rb

@@ -2,6 +2,36 @@ require 'test/helper'
 
 class StringTest < ActiveSupport::TestCase
 
+  def test_extract_controller
+
+    assert_equal ['posts'], 'admin/posts'.extract_controller
+    assert_equal ['typus_users'], 'admin/typus_users'.extract_controller
+    assert_equal ['delayed', 'jobs'], 'admin/delayed/jobs'.extract_controller
+
+    assert_equal ['posts'], 'typus/posts'.extract_controller('typus')
+    assert_equal ['typus_users'], 'typus/typus_users'.extract_controller('typus')
+    assert_equal ['delayed', 'tasks'], 'typus/delayed/tasks'.extract_controller('typus')
+
+  end
+
+  def test_extract_resource
+    assert_equal 'posts', 'admin/posts'.extract_resource
+    assert_equal 'typus_users', 'admin/typus_users'.extract_resource
+    assert_equal 'delayed/tasks', 'admin/delayed/tasks'.extract_resource
+  end
+
+  def test_extract_class
+    assert_equal Post, 'admin/posts'.extract_class
+    assert_equal TypusUser, 'admin/typus_users'.extract_class
+    assert_equal Delayed::Task, 'admin/delayed/tasks'.extract_class
+  end
+
+  def test_extract_human_name
+    assert_equal 'Post', 'admin/posts'.extract_human_name
+    assert_equal 'Typus user', 'admin/typus_users'.extract_human_name
+    assert_equal 'Delayed task', 'admin/delayed/tasks'.extract_human_name
+  end
+
   def test_should_return_post_actions_for_index
     assert_equal %w( cleanup ), 'Post'.typus_actions_for('index')
     assert_equal %w( cleanup ), 'Post'.typus_actions_for(:index)

data/test/lib/typus_test.rb

@@ -15,7 +15,7 @@ class TypusTest < ActiveSupport::TestCase
   def test_should_return_applications_and_should_be_sorted
     assert Typus.respond_to?(:applications)
     assert Typus.applications.kind_of?(Array)
-    assert_equal %w( Blog Site Typus ), Typus.applications
+    assert_equal %w( Blog Site System Typus ), Typus.applications
   end
 
   def test_should_return_modules_of_an_application
@@ -26,7 +26,7 @@ class TypusTest < ActiveSupport::TestCase
   def test_should_return_models_and_should_be_sorted
     assert Typus.respond_to?(:models)
     assert Typus.models.kind_of?(Array)
-    assert_equal %w( Asset Category Comment CustomUser Page Post TypusUser View ), Typus.models
+    assert_equal %w( Asset Category Comment CustomUser Delayed::Task Page Post TypusUser View ), Typus.models
   end
 
   def test_should_return_an_array_of_models_on_header
@@ -36,8 +36,7 @@ class TypusTest < ActiveSupport::TestCase
 
   def test_should_verify_resources_class_method
     assert Typus.respond_to?(:resources)
-    models = Typus.models
-    assert_equal %w( Git Order Status WatchDog ), Typus.resources(models)
+    assert_equal %w( Git Order Status WatchDog ), Typus.resources
   end
 
   def test_should_return_user_class

data/test/models.rb

@@ -58,4 +58,10 @@ class View < ActiveRecord::Base
 
   belongs_to :post
 
+end
+
+class Delayed::Task < ActiveRecord::Base
+
+  set_table_name 'delayed_tasks'
+
 end

data/test/schema.rb

@@ -24,6 +24,10 @@ ActiveRecord::Schema.define do
 
   add_index :comments, :post_id
 
+  create_table :delayed_tasks, :force => true do |t|
+    t.string :name
+  end
+
   create_table :pages, :force => true do |t|
     t.string :title
     t.text :body

data/test/unit/typus_user_roles_test.rb

@@ -12,7 +12,7 @@ class TypusUserRolesTest < ActiveSupport::TestCase
     typus_user = typus_users(:admin)
     assert_equal 'admin', typus_user.role
 
-    models = %w( Asset Category Comment Git Page Post Status TypusUser View WatchDog )
+    models = %w( Asset Category Comment Delayed::Task Git Page Post Status TypusUser View WatchDog )
     assert_equal models, typus_user.resources.map(&:first).sort
 
     # Order exists on the roles, but, as we compact the hash, the

data/test/unit/typus_user_test.rb

@@ -14,14 +14,14 @@ class TypusUserTest < ActiveSupport::TestCase
   end
 
   def test_should_verify_typus_user_attributes
-    %w( first_name last_name email role salt crypted_password ).each do |attribute|
-      assert TypusUser.instance_methods.include?(attribute)
+    [ :first_name, :last_name, :email, :role, :salt, :crypted_password ].each do |attribute|
+      assert TypusUser.instance_methods.map { |i| i.to_sym }.include?(attribute)
     end
   end
 
   def test_should_verify_definition_on_instance_methods
-    %w( is_root? authenticated? ).each do |instance_method|
-      assert TypusUser.instance_methods.include?(instance_method)
+    [ :is_root?, :authenticated? ].each do |instance_method|
+      assert TypusUser.instance_methods.map { |i| i.to_sym }.include?(instance_method)
     end
   end
 
@@ -169,7 +169,7 @@ this_is_chelm@example.com
   end
 
   def test_should_verify_can_perform?
-    assert TypusUser.instance_methods.include?('can_perform?')
+    assert TypusUser.instance_methods.map {|i| i.to_sym }.include?(:can_perform?)
     @current_user = TypusUser.find(:first)
     assert @current_user.can_perform?(TypusUser, 'delete')
     assert @current_user.can_perform?('TypusUser', 'delete')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typus
 version: !ruby/object:Gem::Version 
-  version: 0.9.35
+  version: 0.9.36
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-04 00:00:00 +02:00
+date: 2009-10-13 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -23,6 +23,8 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- CONTRIBUTORS
+- HISTORY.md
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -125,6 +127,7 @@ files:
 - lib/typus/reloader.rb
 - lib/typus/string.rb
 - lib/typus/user.rb
+- lib/typus/version.rb
 - lib/vendor/active_record.rb
 - lib/vendor/paginator.rb
 - lib/vendor/rss_parser.rb
@@ -210,7 +213,6 @@ files:
 - test/unit/typus_user_test.rb
 - test/vendor/active_record_test.rb
 - test/vendor/paginator_test.rb
-- typus.gemspec
 has_rdoc: true
 homepage: http://intraducibles.com/projects/typus
 licenses: []

data/typus.gemspec

@@ -1,268 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{typus}
-  s.version = "0.9.35"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Francesc Esplugas"]
-  s.date = %q{2009-10-04}
-  s.description = %q{Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)}
-  s.email = %q{francesc@intraducibles.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "app/controllers/admin/master_controller.rb",
-     "app/controllers/typus_controller.rb",
-     "app/helpers/admin/form_helper.rb",
-     "app/helpers/admin/master_helper.rb",
-     "app/helpers/admin/public_helper.rb",
-     "app/helpers/admin/sidebar_helper.rb",
-     "app/helpers/admin/table_helper.rb",
-     "app/helpers/typus_helper.rb",
-     "app/models/typus_mailer.rb",
-     "app/models/typus_user.rb",
-     "app/views/admin/dashboard/_sidebar.html.erb",
-     "app/views/admin/resources/edit.html.erb",
-     "app/views/admin/resources/index.html.erb",
-     "app/views/admin/resources/new.html.erb",
-     "app/views/admin/resources/show.html.erb",
-     "app/views/admin/shared/_feedback.html.erb",
-     "app/views/admin/shared/_footer.html.erb",
-     "app/views/admin/shared/_pagination.html.erb",
-     "app/views/admin/templates/_boolean.html.erb",
-     "app/views/admin/templates/_date.html.erb",
-     "app/views/admin/templates/_datetime.html.erb",
-     "app/views/admin/templates/_file.html.erb",
-     "app/views/admin/templates/_password.html.erb",
-     "app/views/admin/templates/_selector.html.erb",
-     "app/views/admin/templates/_string.html.erb",
-     "app/views/admin/templates/_text.html.erb",
-     "app/views/admin/templates/_time.html.erb",
-     "app/views/admin/templates/_tiny_mce.html.erb",
-     "app/views/layouts/admin.html.erb",
-     "app/views/layouts/typus.html.erb",
-     "app/views/typus/dashboard.html.erb",
-     "app/views/typus/recover_password.html.erb",
-     "app/views/typus/reset_password.html.erb",
-     "app/views/typus/sign_in.html.erb",
-     "app/views/typus/sign_up.html.erb",
-     "app/views/typus_mailer/reset_password_link.erb",
-     "config/locales/de.yml",
-     "config/locales/es.yml",
-     "config/locales/fr.yml",
-     "config/locales/language.yml.template",
-     "config/locales/pt-BR.yml",
-     "config/locales/ru.yml",
-     "config/routes.rb",
-     "generators/typus/templates/auto/index.html.erb",
-     "generators/typus/templates/auto/resource_controller.rb.erb",
-     "generators/typus/templates/auto/resource_controller_test.rb.erb",
-     "generators/typus/templates/auto/resources_controller.rb.erb",
-     "generators/typus/templates/config/initializers/typus.rb",
-     "generators/typus/templates/config/typus/README",
-     "generators/typus/templates/config/typus/application.yml",
-     "generators/typus/templates/config/typus/application_roles.yml",
-     "generators/typus/templates/config/typus/typus.yml",
-     "generators/typus/templates/config/typus/typus_roles.yml",
-     "generators/typus/templates/db/create_typus_users.rb",
-     "generators/typus/templates/lib/tasks/typus_tasks.rake",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_closebox.png",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_left.png",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_progress.png",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_right.png",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_e.png",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_n.png",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_ne.png",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_nw.png",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_s.png",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_se.png",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_sw.png",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_w.png",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_title_left.png",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_title_main.png",
-     "generators/typus/templates/public/images/admin/fancybox/fancy_title_right.png",
-     "generators/typus/templates/public/images/admin/ui-icons.png",
-     "generators/typus/templates/public/javascripts/admin/application.js",
-     "generators/typus/templates/public/javascripts/admin/jquery-1.3.2.min.js",
-     "generators/typus/templates/public/javascripts/admin/jquery.fancybox-1.2.1.min.js",
-     "generators/typus/templates/public/stylesheets/admin/jquery.fancybox.css",
-     "generators/typus/templates/public/stylesheets/admin/reset.css",
-     "generators/typus/templates/public/stylesheets/admin/screen.css",
-     "generators/typus/typus_generator.rb",
-     "generators/typus_update_schema_to_01/templates/config/typus.yml",
-     "generators/typus_update_schema_to_01/templates/migration.rb",
-     "generators/typus_update_schema_to_01/typus_update_schema_to_01_generator.rb",
-     "generators/typus_update_schema_to_02/templates/migration.rb",
-     "generators/typus_update_schema_to_02/typus_update_schema_to_02_generator.rb",
-     "lib/typus.rb",
-     "lib/typus/active_record.rb",
-     "lib/typus/authentication.rb",
-     "lib/typus/configuration.rb",
-     "lib/typus/extensions/routes.rb",
-     "lib/typus/extensions/routes_hack.rb",
-     "lib/typus/format.rb",
-     "lib/typus/hash.rb",
-     "lib/typus/object.rb",
-     "lib/typus/preferences.rb",
-     "lib/typus/preview.rb",
-     "lib/typus/quick_edit.rb",
-     "lib/typus/reloader.rb",
-     "lib/typus/string.rb",
-     "lib/typus/user.rb",
-     "lib/vendor/active_record.rb",
-     "lib/vendor/paginator.rb",
-     "lib/vendor/rss_parser.rb",
-     "rails/init.rb",
-     "tasks/typus_tasks.rake",
-     "test/config/broken/application.yml",
-     "test/config/broken/application_roles.yml",
-     "test/config/broken/empty.yml",
-     "test/config/broken/empty_roles.yml",
-     "test/config/broken/undefined.yml",
-     "test/config/broken/undefined_roles.yml",
-     "test/config/default/typus.yml",
-     "test/config/default/typus_roles.yml",
-     "test/config/empty/empty_01.yml",
-     "test/config/empty/empty_01_roles.yml",
-     "test/config/empty/empty_02.yml",
-     "test/config/empty/empty_02_roles.yml",
-     "test/config/locales/es.yml",
-     "test/config/ordered/001_roles.yml",
-     "test/config/ordered/002_roles.yml",
-     "test/config/unordered/app_one_roles.yml",
-     "test/config/unordered/app_two_roles.yml",
-     "test/config/working/application.yml",
-     "test/config/working/application_roles.yml",
-     "test/config/working/typus.yml",
-     "test/config/working/typus_roles.yml",
-     "test/fixtures/app/controllers/admin/assets_controller.rb",
-     "test/fixtures/app/controllers/admin/categories_controller.rb",
-     "test/fixtures/app/controllers/admin/comments_controller.rb",
-     "test/fixtures/app/controllers/admin/pages_controller.rb",
-     "test/fixtures/app/controllers/admin/posts_controller.rb",
-     "test/fixtures/app/controllers/admin/status_controller.rb",
-     "test/fixtures/app/controllers/admin/typus_users_controller.rb",
-     "test/fixtures/app/controllers/admin/watch_dog_controller.rb",
-     "test/fixtures/app/views/admin/dashboard/_content.html.erb",
-     "test/fixtures/app/views/admin/dashboard/_sidebar.html.erb",
-     "test/fixtures/app/views/admin/posts/_edit.html.erb",
-     "test/fixtures/app/views/admin/posts/_index.html.erb",
-     "test/fixtures/app/views/admin/posts/_new.html.erb",
-     "test/fixtures/app/views/admin/posts/_show.html.erb",
-     "test/fixtures/app/views/admin/posts/_sidebar.html.erb",
-     "test/fixtures/app/views/admin/resources/_sidebar.html.erb",
-     "test/fixtures/app/views/admin/shared/_footer.html.erb",
-     "test/fixtures/app/views/admin/status/index.html.erb",
-     "test/fixtures/app/views/admin/templates/_datepicker.html.erb",
-     "test/fixtures/assets.yml",
-     "test/fixtures/categories.yml",
-     "test/fixtures/comments.yml",
-     "test/fixtures/pages.yml",
-     "test/fixtures/posts.yml",
-     "test/fixtures/typus_users.yml",
-     "test/functional/admin/master_controller_assets_relationships.rb",
-     "test/functional/admin/master_controller_categories_lists_test.rb",
-     "test/functional/admin/master_controller_posts_before_test.rb",
-     "test/functional/admin/master_controller_posts_crud_test.rb",
-     "test/functional/admin/master_controller_posts_formats_test.rb",
-     "test/functional/admin/master_controller_posts_permissions_test.rb",
-     "test/functional/admin/master_controller_posts_relationships_test.rb",
-     "test/functional/admin/master_controller_posts_roles.rb",
-     "test/functional/admin/master_controller_posts_toggle_test.rb",
-     "test/functional/admin/master_controller_posts_views_test.rb",
-     "test/functional/admin/master_controller_tableless_resource_test.rb",
-     "test/functional/admin/master_controller_typus_users_test.rb",
-     "test/functional/typus_controller_test.rb",
-     "test/helper.rb",
-     "test/helpers/admin/form_helper_test.rb",
-     "test/helpers/admin/master_helper_test.rb",
-     "test/helpers/admin/public_helper_test.rb",
-     "test/helpers/admin/sidebar_helper_test.rb",
-     "test/helpers/admin/table_helper_test.rb",
-     "test/helpers/typus_helper_test.rb",
-     "test/lib/active_record_test.rb",
-     "test/lib/configuration_test.rb",
-     "test/lib/hash_test.rb",
-     "test/lib/routes_test.rb",
-     "test/lib/string_test.rb",
-     "test/lib/typus_test.rb",
-     "test/models.rb",
-     "test/schema.rb",
-     "test/unit/typus_mailer_test.rb",
-     "test/unit/typus_test.rb",
-     "test/unit/typus_user_roles_test.rb",
-     "test/unit/typus_user_test.rb",
-     "test/vendor/active_record_test.rb",
-     "test/vendor/paginator_test.rb",
-     "typus.gemspec"
-  ]
-  s.homepage = %q{http://intraducibles.com/projects/typus}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)}
-  s.test_files = [
-    "test/fixtures/app/controllers/admin/assets_controller.rb",
-     "test/fixtures/app/controllers/admin/categories_controller.rb",
-     "test/fixtures/app/controllers/admin/comments_controller.rb",
-     "test/fixtures/app/controllers/admin/pages_controller.rb",
-     "test/fixtures/app/controllers/admin/posts_controller.rb",
-     "test/fixtures/app/controllers/admin/status_controller.rb",
-     "test/fixtures/app/controllers/admin/typus_users_controller.rb",
-     "test/fixtures/app/controllers/admin/watch_dog_controller.rb",
-     "test/functional/admin/master_controller_assets_relationships.rb",
-     "test/functional/admin/master_controller_categories_lists_test.rb",
-     "test/functional/admin/master_controller_posts_before_test.rb",
-     "test/functional/admin/master_controller_posts_crud_test.rb",
-     "test/functional/admin/master_controller_posts_formats_test.rb",
-     "test/functional/admin/master_controller_posts_permissions_test.rb",
-     "test/functional/admin/master_controller_posts_relationships_test.rb",
-     "test/functional/admin/master_controller_posts_roles.rb",
-     "test/functional/admin/master_controller_posts_toggle_test.rb",
-     "test/functional/admin/master_controller_posts_views_test.rb",
-     "test/functional/admin/master_controller_tableless_resource_test.rb",
-     "test/functional/admin/master_controller_typus_users_test.rb",
-     "test/functional/typus_controller_test.rb",
-     "test/helper.rb",
-     "test/helpers/admin/form_helper_test.rb",
-     "test/helpers/admin/master_helper_test.rb",
-     "test/helpers/admin/public_helper_test.rb",
-     "test/helpers/admin/sidebar_helper_test.rb",
-     "test/helpers/admin/table_helper_test.rb",
-     "test/helpers/typus_helper_test.rb",
-     "test/lib/active_record_test.rb",
-     "test/lib/configuration_test.rb",
-     "test/lib/hash_test.rb",
-     "test/lib/routes_test.rb",
-     "test/lib/string_test.rb",
-     "test/lib/typus_test.rb",
-     "test/models.rb",
-     "test/schema.rb",
-     "test/unit/typus_mailer_test.rb",
-     "test/unit/typus_test.rb",
-     "test/unit/typus_user_roles_test.rb",
-     "test/unit/typus_user_test.rb",
-     "test/vendor/active_record_test.rb",
-     "test/vendor/paginator_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end