fesplugas-typus 0.9.16 → 0.9.17

data/README.rdoc

@@ -72,6 +72,7 @@ Typus and blog about Typus.
 - 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
 
 == Acknowledgments
 

data/VERSION

@@ -1 +1 @@
-0.9.16
+0.9.17

data/app/helpers/admin/sidebar_helper.rb

@@ -37,7 +37,7 @@ module Admin::SidebarHelper
 
     @resource[:class].typus_actions_for(params[:action]).each do |action|
       if @current_user.can_perform?(@resource[:class], action)
-        items << (link_to action.humanize, params.merge(:action => action))
+        items << (link_to _(action.humanize), params.merge(:action => action))
       end
     end
 
@@ -169,12 +169,12 @@ function surfto_#{model_pluralized}(form) {
 }
 </script>
 <!-- /Embedded JS -->
-<p><form class="form" action="#">
+<form class="form" action="#"><p>
   <select name="#{model_pluralized}" onChange="surfto_#{model_pluralized}(this.form)">
     <option value="#{url_for params_without_filter}">#{_("filter by")} #{_(model.typus_human_name)}</option>
     #{items.join("\n")}
   </select>
-</form></p>
+</p></form>
         HTML
       else
         related_items.each do |item|

data/config/locales/typus/de.yml

@@ -0,0 +1,109 @@
+# German translations for Typus
+# by Michael Grunewalder <http://michael.grunewalder.com>
+
+de:
+  "Email": "Email"
+  "Password": "Passwort"
+  "Password confirmation": "Passwort Best&auml;tigung"
+  "Sign in": "Anmelden"
+  "Recover password": "Passwort vergessen?"
+  "Sign up": "Konto erstellen"
+  "Enter your email below to create the first user": "Geben Sie Ihre Email Adresse unten ein, um den ersten Benutzer zu erstellen"
+  "That doesn't seem like a valid email address": "Das schein keine g&uuml;ltige Email Dresse zu sein"
+  "I remember my password": "Ich erinnere mein Passwort"
+  "Password recovery link sent to your email": "Der Link zur Wiederfindung des Passworts wurde an Ihre Email Adresse gechickt"
+  "A valid token is required": "Ein g&uuml;ltiges Merkmal ist erforderlich"
+  "The email and/or password you entered is invalid": "Die eingegebene Email Adresse und/oder das Passwort ist ung&uuml;ltig"
+  "There are not defined applications in config/typus/*.yml": "Es gibt keine definierten Anwendungen in config/typus/*.yml"
+  "Overview": "&Uuml;bersicht"
+  "Options": "Optionen"
+  "Password confirm": "Passwort best&auml;tigen"
+  "Change password": "Passwort &auml;ndern"
+  "There are no {{records}}": "Keine {{records}}vorhanden"
+  "There are no {{records}} under this filter": "Unter diesem Filter sind keine {{records}} vorhanden"
+  "Dashboard": "Dashboard"
+  "Create entry": "Eintrag erstellen"
+  "Update entry": "Eintrag &auml;ndern"
+  "New": "Neu"
+  "Show": "Anzeigen"
+  "Edit": "Bearbeiten"
+  "Login": "Anmeldem"
+  "Setup": "Einrichten"
+  "Create": "Erstellen"
+  "Sign out": "Abmelden"
+  "Update": "&Uuml;berarbeiten"
+  "View site": "Site anzeigen"
+  "Logged as": "Aufgezeichnet als"
+  "Remove filter": "Filter entfernen"
+  "Back to list": "Zur7uuml;ck zur Liste"
+  "Actions": "Aktionen"
+  "Add": "Zuf&uuml;gen"
+  "&larr; Previous": "&larr; Vorheriger"
+  "Next &rarr;": "N&auml;chster &rarr"
+  "Previous": "Vorheriger"
+  "Next": "N&auml;chster"
+  "Search": "Suchen"
+  "Search by": "Suchen nach"
+  "{{model}} successfully updated": "{{model}} erfolgreich ge&auml;ndert"
+  "{{model}} successfully created": "{{model}} erfolgreich erstellt"
+  "{{model}} successfully removed": "{{model}} erfolgreich gel&ouml;scht"
+  "{{model}} {{attribute}} changed": "{{model}} {{attribute}} ge&auml;ndert" 
+  "You're adding a new {{resource_from}} to {{resource_to}}": "Sie f&uuml;gen eine neue {{resource_from}} an {{resource_to}}"
+  "You're adding a new {{resource_from}}": "Sie erstellen eine neue {{resource_from}}"
+  "You're updating a {{resource_from}} for {{resource_to}}": "Sie bearbeiten eine {{resource_from}} f&uuml; {{resource_to}}"
+  "You're updating a {{resource_from}}": "Sie bearbeiten eine {{resource_from}}"
+  "Toggle is disabled": "Schalter ist deaktiviert"
+  "Record moved {{to}}": "Datensatz verschoben nach {{to}}"
+  "{{model_a}} related to {{model_b}}": "{{model_a}} ist verkn&uuml;pft mit {{model_b}}"
+  "{{model_a}} successfully assigned to {{model_b}}": "{{model_a}} erfolgreich an {{model_b}} zugewiesen"
+  "{{model_a}} unrelated from {{model_b}}": "{{model_a}} unverbunden mit {{model_b}}"
+  "{{model_a}} removed from {{model_b}}": "{{model_a}} erfolgreich von {{model_b}}entfernt"
+  "Your new password is {{password}}": "Ihr neues Passwort ist {{password}}"
+  "Add entry": "Eintrag erstellen"
+  "Go to": "Gehe zu"
+  "First name": "Vorname"
+  "Last name": "Nachname"
+  "Roles": "Rollen"
+  "Status": "Status"
+  "Typus User": "Typus Benutzer"
+  "System Users Administration": "System Benutzer Verwaltung"
+  "Resources": "Resourcen"
+  "Up": "Hoch"
+  "Down": "Runter"
+  "filter by": "filter nach"
+  "Checked if active": "Angekreuzt wenn activiert"
+  "As you're not the admin or the owner of this record you cannot edit it": "Nur der Administrator oder der Eigent7uuml;er des Datensates kann ihn bearbeiten"
+  "You can't change your role": "Sie k&ouml;nnen Ihre Rolle nicht &auml;ndern"
+  "Error! Typus User or role doesn't exist": "Fehler: Typus Benutzer oder Rolle existiert nicht"
+  "You can't toggle your status": "Sie k&ouml;nnen Ihren Status nicht umschalten"
+  "You're not allowed to toggle status": "Sie k&ouml;nnen den Status nicht umschalten"
+  "You can't remove yourself": "Sie k&ouml;nnen sich selbst nicht entfernen"
+  "You're not allowed to remove Typus Users": "Sie sind nicht berechtigt den Typus Benutzer zu entfernen"
+  "{{current_user_role}} can't perform action. ({{action}})": "{{current_user_role}} kann die Aktion nicht ausf&uuml;hren. ({{action}})"
+  "{{current_user_role}} can't go to {{action}} on {{controller}}": "{{current_user_role}} kann {{action}} von {{controller}} nicht asuf&uuml;hren"
+  "{{current_user_role}} can't delete this item": "{{current_user_role}} kann diesen Eintrag nicht l&ouml;schen"
+  "{{current_user_role}} can't perform action ({{action}})": "{{current_user_role}} kann diese Aktion nicht ausf&uuml;hren"
+  "{{current_user_role}} can't display items": "{{current_user_role}} kann Eintr&auml;ge nicht anzeigen"
+  "You can update your password at": "Sie k7ouml;nnen Ihr Passwort &auml;ndern unter"
+  "If you didn't request a password update, you can ignore this message": "Falls Sie keine Passwort &Auml;derung beantragt haben, k&ouml;nnen Sie diese nachricht ignorieren"
+  "Have a nice day": "Haben Sie einen guten Tag"
+  "Reset password": "Passwort zur&uuml;cksetzen"
+  "Add new": "Erstellen"
+  "Do you want to cancel it?": "Wollen Sie abbrechen?"
+  "Click here": "Hier klicken"
+  "Are you sure you want to leave this page?": "Sind Sie sicher, dass Sie diese Seite verlassen m&ouml;chten?"
+  "If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost": "Wenn Sie &Auml;nderungen an Feldern vorgenommen haben, ohne den Speichern/Bearbeiten Knopf gedr7uuml;ckt zu haben, gehen diese &Auml;nderungen verloren"
+  "Click OK to continue, or click Cancel to stay on this page": "Klicken Sie OK zum Fortfahren oder Abbrechen um auf dieser Seite zu bleiben"
+  "Remove entry?": "Eintrag entfernen?"
+  "Unrelate {{unrelate_model}} from {{unrelate_model_from}}?": "Verkn&uuml;pfung zwischen {{unrelate_model}} und {{unrelate_model_from}}entfernen?"
+  "Change {{attribute}}?": "{{attribute}}&auml;ndern?"
+  "Set language": "Sprache einstellen"
+  "Today": "Heute"
+  "Past 7 days": "Letzten 7 Tage"
+  "This month": "Diesen Monat"
+  "This year": "Dieses Jahr"
+  "{{model}} filtered by {{filtered_by}}": "{{model}} gefiltert nach {{filtered_by}}"
+  "True": "Richtig"
+  "False": "Falsch"
+  "Set language to": "Sprache wechseln zu"
+  "Are you sure you want to sign out and end your session?": "Wollen Sie sich abmelden und die Sitzung beenden?"

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

@@ -104,8 +104,8 @@ pt-BR:
   "This year": "Este ano"
   "Created at": "Criado em"
   "Updated at": "Atualizado em"
-  "{{model}} filtered by {{filtered_by}}": 
-  "True": 
-  "False": 
-  "Set language to": 
-  "Are you sure you want to sign out and end your session?": 
+  "{{model}} filtered by {{filtered_by}}": "{{model}} filtrados por {{filtered_by}}"
+  "True": "Verdadeiro"
+  "False": "Falso"
+  "Set language to": "Idioma"
+  "Are you sure you want to sign out and end your session?": "Tem certeza que quer sair e encerrar sua sessão?"

data/generators/typus/typus_generator.rb

@@ -83,7 +83,7 @@ class TypusGenerator < Rails::Generator::Base
 
       end
 
-      Dir["#{Typus.path}/generators/typus/templates/config/typus/*"].each do |f|
+      Dir["#{Typus.root}/generators/typus/templates/config/typus/*"].each do |f|
         base = File.basename(f)
         m.template "config/typus/#{base}", "#{config_folder}/#{base}", 
                    :assigns => { :configuration => configuration }
@@ -105,7 +105,7 @@ class TypusGenerator < Rails::Generator::Base
         'public/stylesheets/admin/reset.css', 
         'public/javascripts/admin/application.js' ].each { |f| m.file f, f }
 
-      Dir["#{Typus.path}/generators/typus/templates/public/images/admin/*"].each do |f|
+      Dir["#{Typus.root}/generators/typus/templates/public/images/admin/*"].each do |f|
         file = "public/images/admin/#{File.basename(f)}"
         m.file file, file
       end

data/generators/typus_update_schema_to_01/typus_update_schema_to_01_generator.rb

@@ -5,7 +5,7 @@ class TypusUpdateSchemaTo01Generator < Rails::Generator::Base
     record do |m|
 
       config_folder = Typus::Configuration.options[:config_folder]
-      Dir["#{Typus.path}/generators/typus_update_schema_to_01/templates/config/*"].each do |f|
+      Dir["#{Typus.root}/generators/typus_update_schema_to_01/templates/config/*"].each do |f|
         base = File.basename(f)
         m.template "config/#{base}", "#{config_folder}/#{base}"
       end

data/lib/typus.rb

@@ -1,25 +1,12 @@
-class ActionController::Routing::RouteSet
-
-  def load_routes_with_typus!
-    lib_path = File.dirname(__FILE__)
-    typus_routes = File.join(lib_path, *%w[ .. config routes_hack.rb ])
-    add_configuration_file(typus_routes) unless configuration_files.include?(typus_routes)
-    load_routes_without_typus!
-  end
-
-  alias_method_chain :load_routes!, :typus
-
-end
-
 module Typus
 
   class << self
 
     def version
-      @@version ||= File.read("#{path}/VERSION").strip
+      @@version ||= File.read("#{root}/VERSION").strip
     end
 
-    def path
+    def root
       File.dirname(__FILE__) + '/../'
     end
 
@@ -80,8 +67,14 @@ module Typus
       File.exist?("#{Rails.root}/vendor/plugins/typus")
     end
 
-    # Enable application. This is used at boot time.
-    def enable
+    def boot!
+
+      # return unless File.exists?("#{Rails.root}/config/initializers/typus.rb") || testing?
+      return if %w( script/generate script/destroy ).include?($0)
+
+      if testing?
+        Typus::Configuration.options[:config_folder] = 'vendor/plugins/typus/test/config/working'
+      end
 
       # Ruby Extensions
       require 'typus/hash'
@@ -94,16 +87,17 @@ module Typus
 
       # Load translation files from the plugin or the gem.
       if plugin?
-        I18n.load_path += Dir[File.join("#{Rails.root}/vendor/plugins/typus/config/locales/**/*.{rb,yml}")]
+        I18n.load_path += Dir[File.join(root, 'config', 'locales', '**', '*.{rb,yml}')]
       else
         Gem.path.each { |g| I18n.load_path += Dir[File.join("#{g}/gems/*typus-#{version}/config/locales/**/*.{rb,yml}")] }
       end
 
       # Require the test/models on when testing.
-      require File.dirname(__FILE__) + '/../test/models' if Typus.testing?
+      require File.dirname(__FILE__) + '/../test/models' if testing?
 
       # Rails Extensions.
       require 'typus/active_record'
+      require 'typus/extensions/routes'
 
       # Mixins.
       require 'typus/authentication'
@@ -118,6 +112,9 @@ module Typus
       require 'vendor/active_record'
       require 'vendor/paginator'
 
+      # Run controllers generator ...
+      generator unless testing? || Rails.env.production?
+
     end
 
   end

data/lib/typus/extensions/routes.rb

@@ -0,0 +1,15 @@
+if defined?(ActionController::Routing::RouteSet)
+
+  class ActionController::Routing::RouteSet
+
+    def load_routes_with_typus!
+      typus_routes = File.join(File.dirname(__FILE__), 'routes_hack.rb')
+      add_configuration_file(typus_routes) unless configuration_files.include?(typus_routes)
+      load_routes_without_typus!
+    end
+
+    alias_method_chain :load_routes!, :typus
+
+  end
+
+end

data/lib/typus/generator.rb

@@ -1,9 +1,9 @@
+require 'ftools'
+
 module Typus
 
   def self.generator
 
-    logger = Logger.new("#{Rails.root}/log/#{Rails.env}.log")
-
     # Create app/controllers/admin if doesn't exist.
     admin_controllers_folder = "#{Rails.root}/app/controllers/admin"
     Dir.mkdir(admin_controllers_folder) unless File.directory?(admin_controllers_folder)
@@ -23,7 +23,7 @@ module Typus
     end
 
     # Get a list of functional tests under `test/functional/admin`.
-    admin_controller_tests = Dir["#{Rails.root}/vendor/plugins/*/test/functional/admin/*.rb", "#{admin_controller_tests_folder}/*.rb"]
+    admin_controller_tests = Dir["#{admin_controller_tests_folder}/*.rb"]
     admin_controller_tests = admin_controller_tests.map { |i| File.basename(i) }
 
     # Generate controllers for tableless models.
@@ -33,28 +33,9 @@ module Typus
       controller_location = "#{admin_controllers_folder}/#{controller_filename}"
 
       if !admin_controllers.include?(controller_filename)
-
-        content = <<-RAW
-# Controller generated by Typus, use it to extend admin functionality.
-class Admin::#{resource}Controller < TypusController
-
-  ##
-  # This controller was generated because you have defined a resource 
-  # on <tt>config/typus/XXXXXX_roles.yml</tt> which is a tableless model.
-  #
-  #     admin:
-  #       #{resource}: index
-  #
-
-  def index
-  end
-
-end
-      RAW
-
+        template = File.read("#{File.dirname(__FILE__)}/templates/resource_controller.rb.erb")
+        content = ERB.new(template).result(binding)
         File.open(controller_location, "w+") { |f| f << content }
-        logger.info "=> [typus] Admin::#{resource}Controller successfully created."
-
       end
 
       # And now we create the view.
@@ -63,106 +44,34 @@ end
 
       if !File.exist?("#{view_folder}/#{view_filename}")
         Dir.mkdir(view_folder) unless File.directory?(view_folder)
-
-        content = <<-RAW
-<!-- Sidebar -->
-
-<% content_for :sidebar do %>
-<%= typus_block :location => 'dashboard', :partial => 'sidebar' %>
-<% end %>
-
-<!-- Content -->
-
-<h2>#{resource.humanize}</h2>
-
-<p>And here we do whatever we want to ...</p>
-
-        RAW
-
-        File.open("#{view_folder}/#{view_filename}", "w+") { |f| f << content}
-        logger.info "=> [typus] app/views/admin/#{resource.underscore}/index.html.erb successfully created."
-
+        origin = "#{File.dirname(__FILE__)}/templates/index.html.erb"
+        destination = "#{view_folder}/#{view_filename}"
+        File.copy(origin, destination)
       end
 
     end
 
-    # Generate unexisting controllers for resources which are tied to a 
-    # model.
+    # Generate:
+    #   `app/controllers/admin/#{resource}_controller.rb`
+    #   `test/functional/admin/#{resource}_controller_test.rb`
     models.each do |model|
 
-      # Controller app/controllers/admin/*
       controller_filename = "#{model.tableize}_controller.rb"
       controller_location = "#{admin_controllers_folder}/#{controller_filename}"
 
       if !admin_controllers.include?(controller_filename)
-
-        content = <<-RAW
-# Controller generated by Typus, use it to extend admin functionality.
-class Admin::#{model.pluralize}Controller < Admin::MasterController
-
-=begin
-
-  ##
-  # You can overwrite and extend Admin::MasterController with your methods.
-  #
-  # Actions have to be defined in <tt>config/typus/application.yml</tt>:
-  #
-  #   #{model}:
-  #     actions:
-  #       index: custom_action
-  #       edit: custom_action_for_an_item
-  #
-  # And you have to add permissions on <tt>config/typus/application_roles.yml</tt> 
-  # to have access to them.
-  #
-  #   admin:
-  #     #{model}: create, read, update, destroy, custom_action
-  #
-  #   editor:
-  #     #{model}: create, read, update, custom_action_for_an_item
-  #
-
-  def index
-  end
-
-  def custom_action
-  end
-
-  def custom_action_for_an_item
-  end
-
-=end
-
-end
-        RAW
-
+        template = File.read("#{File.dirname(__FILE__)}/templates/resources_controller.rb.erb")
+        content = ERB.new(template).result(binding)
         File.open(controller_location, "w+") { |f| f << content }
-        logger.info "=> [typus] Admin::#{model.pluralize}Controller successfully created."
-
       end
 
-      # Test test/functional/admin/*_test.rb
       test_filename = "#{model.tableize}_controller_test.rb"
       test_location = "#{admin_controller_tests_folder}/#{test_filename}"
 
       if !admin_controller_tests.include?(test_filename) && File.directory?("#{Rails.root}/test")
-
-        content = <<-RAW
-require 'test_helper'
-
-class Admin::#{model.pluralize}ControllerTest < ActionController::TestCase
-
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-
-end
-        RAW
-
+        template = File.read("#{File.dirname(__FILE__)}/templates/resource_controller_test.rb.erb")
+        content = ERB.new(template).result(binding)
         File.open(test_location, "w+") { |f| f << content }
-        logger.info "=> [typus] Admin::#{model.pluralize}ControllerTest successfully created."
-
       end
 
     end

data/lib/typus/templates/index.html.erb

@@ -0,0 +1,11 @@
+<!-- Sidebar -->
+
+<% content_for :sidebar do %>
+<%= typus_block :location => 'dashboard', :partial => 'sidebar' %>
+<% end %>
+
+<!-- Content -->
+
+<h2>Resource#index</h2>
+
+<p>Find me in app/views/<%= params[:controller] %>/index.html.erb</p>

data/lib/typus/templates/resource_controller.rb.erb

@@ -0,0 +1,15 @@
+# Controller generated by Typus, use it to extend admin functionality.
+class Admin::<%= resource %>Controller < TypusController
+
+  ##
+  # This controller was generated because you have defined a resource 
+  # on <tt>config/typus/XXXXXX_roles.yml</tt> which is a tableless model.
+  #
+  #     admin:
+  #       <%= resource %>: index
+  #
+
+  def index
+  end
+
+end

data/lib/typus/templates/resource_controller_test.rb.erb

@@ -0,0 +1,10 @@
+require 'test_helper'
+
+class Admin::<%= model.pluralize %>ControllerTest < ActionController::TestCase
+
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+
+end

data/lib/typus/templates/resources_controller.rb.erb

@@ -0,0 +1,37 @@
+# Controller generated by Typus, use it to extend admin functionality.
+class Admin::<%= model.pluralize %>Controller < Admin::MasterController
+
+=begin
+
+  ##
+  # You can overwrite and extend Admin::MasterController with your methods.
+  #
+  # Actions have to be defined in <tt>config/typus/application.yml</tt>:
+  #
+  #   <%= model %>:
+  #     actions:
+  #       index: custom_action
+  #       edit: custom_action_for_an_item
+  #
+  # And you have to add permissions on <tt>config/typus/application_roles.yml</tt> 
+  # to have access to them.
+  #
+  #   admin:
+  #     <%= model %>: create, read, update, destroy, custom_action
+  #
+  #   editor:
+  #     <%= model %>: create, read, update, custom_action_for_an_item
+  #
+
+  def index
+  end
+
+  def custom_action
+  end
+
+  def custom_action_for_an_item
+  end
+
+=end
+
+end

data/rails/init.rb

@@ -1,16 +1,3 @@
 require 'typus'
 
-if Typus.testing?
-  Typus::Configuration.options[:config_folder] = 'vendor/plugins/typus/test/config/working'
-end
-
-##
-# Do not Typus.enable or Typus.generate if we are running a generator.
-#
-
-scripts = %w( script/generate script/destroy )
-
-unless scripts.include?($0)
-  Typus.enable
-  Typus.generator unless Typus.testing?
-end
+Typus.boot!

data/test/functional/admin/posts_controller_test.rb

@@ -60,7 +60,7 @@ class Admin::PostsControllerTest < ActionController::TestCase
     assert_difference 'Post.count' do
       post :create, { :item => { :title => 'This is another title', :body => 'Body' } }
       assert_response :redirect
-      assert_redirected_to :action => 'edit'
+      assert_redirected_to :controller => 'admin/posts', :action => 'edit', :id => Post.last
     end
 
   end
@@ -99,7 +99,7 @@ class Admin::PostsControllerTest < ActionController::TestCase
     post_ = posts(:published)
     post :update, { :id => post_.id, :title => 'Updated' }
     assert_response :redirect
-    assert_redirected_to :action => 'edit', :id => post_.id
+    assert_redirected_to :controller => 'admin/posts', :action => 'edit', :id => post_.id
 
   end
 

data/test/helper.rb

@@ -34,13 +34,13 @@ require File.dirname(__FILE__) + '/schema'
 
 ActiveSupport::Dependencies.load_paths = []
 %w( models controllers helpers ).each do |folder|
-  ActiveSupport::Dependencies.load_paths << File.join(Rails.root, 'vendor/plugins/typus/app', folder)
-  ActiveSupport::Dependencies.load_paths << File.join(Rails.root, 'vendor/plugins/typus/test/fixtures/app', folder)
+  ActiveSupport::Dependencies.load_paths << File.join(Typus.root, 'app', folder)
+  ActiveSupport::Dependencies.load_paths << File.join(Typus.root, 'test', 'fixtures', 'app', folder)
 end
 
 ActionController::Base.view_paths = []
 %w( app/views test/fixtures/app/views ).each do |folder|
-  ActionController::Base.append_view_path(File.join(Rails.root, 'vendor/plugins/typus', folder))
+  ActionController::Base.append_view_path(File.join(Typus.root, folder))
 end
 
 class ActiveSupport::TestCase

data/test/helpers/admin/sidebar_helper_test.rb

@@ -58,15 +58,8 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
 
     output = export
 
-    # FIXME or OPTIMIZE
-
-    begin
-      expected = ["<a href=\"http://test.host/admin/custom_users.csv\">CSV</a>"]
-      assert_equal expected, output
-    rescue
-      expected = ["<a href=\"http://test.host/admin/custom_users?format=csv\">CSV</a>"]
-      assert_equal expected, output
-    end
+    expected = ["<a href=\"http://test.host/admin/custom_users.csv\">CSV</a>"]
+    assert_equal expected, output
 
   end
 

data/test/lib/typus_test.rb

@@ -9,7 +9,7 @@ class TypusTest < ActiveSupport::TestCase
 
   def test_should_return_path
     expected = Dir.pwd + '/lib/../'
-    assert_equal expected, Typus.path
+    assert_equal expected, Typus.root
   end
 
   def test_should_return_locales

data/typus.gemspec

@@ -1,12 +1,15 @@
+# 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.16"
+  s.version = "0.9.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesc Esplugas"]
-  s.date = %q{2009-07-09}
+  s.date = %q{2009-08-18}
   s.description = %q{Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)}
   s.email = %q{francesc@intraducibles.com}
   s.extra_rdoc_files = [
@@ -43,12 +46,11 @@ Gem::Specification.new do |s|
      "app/views/typus/sign_in.html.erb",
      "app/views/typus/sign_up.html.erb",
      "app/views/typus_mailer/reset_password_link.erb",
+     "config/locales/typus/de.yml",
      "config/locales/typus/es.yml",
      "config/locales/typus/language.yml.template",
      "config/locales/typus/pt-BR.yml",
      "config/locales/typus/ru.yml",
-     "config/routes.rb",
-     "config/routes_hack.rb",
      "generators/typus/templates/config/initializers/typus.rb",
      "generators/typus/templates/config/typus/README",
      "generators/typus/templates/config/typus/application.yml",
@@ -73,6 +75,7 @@ Gem::Specification.new do |s|
      "lib/typus/active_record.rb",
      "lib/typus/authentication.rb",
      "lib/typus/configuration.rb",
+     "lib/typus/extensions/routes.rb",
      "lib/typus/format.rb",
      "lib/typus/generator.rb",
      "lib/typus/hash.rb",
@@ -81,6 +84,10 @@ Gem::Specification.new do |s|
      "lib/typus/quick_edit.rb",
      "lib/typus/reloader.rb",
      "lib/typus/string.rb",
+     "lib/typus/templates/index.html.erb",
+     "lib/typus/templates/resource_controller.rb.erb",
+     "lib/typus/templates/resource_controller_test.rb.erb",
+     "lib/typus/templates/resources_controller.rb.erb",
      "lib/typus/user.rb",
      "lib/vendor/active_record.rb",
      "lib/vendor/paginator.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fesplugas-typus
 version: !ruby/object:Gem::Version 
-  version: 0.9.16
+  version: 0.9.17
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-09 00:00:00 -07:00
+date: 2009-08-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -52,12 +52,11 @@ files:
 - app/views/typus/sign_in.html.erb
 - app/views/typus/sign_up.html.erb
 - app/views/typus_mailer/reset_password_link.erb
+- config/locales/typus/de.yml
 - config/locales/typus/es.yml
 - config/locales/typus/language.yml.template
 - config/locales/typus/pt-BR.yml
 - config/locales/typus/ru.yml
-- config/routes.rb
-- config/routes_hack.rb
 - generators/typus/templates/config/initializers/typus.rb
 - generators/typus/templates/config/typus/README
 - generators/typus/templates/config/typus/application.yml
@@ -82,6 +81,7 @@ files:
 - lib/typus/active_record.rb
 - lib/typus/authentication.rb
 - lib/typus/configuration.rb
+- lib/typus/extensions/routes.rb
 - lib/typus/format.rb
 - lib/typus/generator.rb
 - lib/typus/hash.rb
@@ -90,6 +90,10 @@ files:
 - lib/typus/quick_edit.rb
 - lib/typus/reloader.rb
 - lib/typus/string.rb
+- lib/typus/templates/index.html.erb
+- lib/typus/templates/resource_controller.rb.erb
+- lib/typus/templates/resource_controller_test.rb.erb
+- lib/typus/templates/resources_controller.rb.erb
 - lib/typus/user.rb
 - lib/vendor/active_record.rb
 - lib/vendor/paginator.rb
@@ -173,6 +177,7 @@ files:
 - typus.gemspec
 has_rdoc: true
 homepage: http://intraducibles.com/projects/typus
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -193,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)

data/config/routes.rb

@@ -1,14 +0,0 @@
-ActionController::Routing::Routes.draw do |map|
-
-  map.with_options :controller => 'typus', :path_prefix => 'admin' do |i|
-    i.admin_quick_edit 'quick_edit', :action => 'quick_edit'
-    i.admin_dashboard '', :action => 'dashboard'
-    i.admin_sign_in 'sign_in', :action => 'sign_in'
-    i.admin_sign_out 'sign_out', :action => 'sign_out'
-    i.admin_sign_up 'sign_up', :action => 'sign_up'
-    i.admin_recover_password 'recover_password', :action => 'recover_password'
-    i.admin_reset_password 'reset_password', :action => 'reset_password'
-    i.admin_set_locale 'set_locale', :action => 'set_locale'
-  end
-
-end

data/config/routes_hack.rb

@@ -1,9 +0,0 @@
-ActionController::Routing::Routes.draw do |map|
-
-  begin
-    ActionController::Routing::Routes.recognize_path '/admin/typus_users'
-  rescue
-    map.connect ':controller/:action/:id'
-  end
-
-end