typus 0.9.32 → 0.9.33

data/VERSION

@@ -1 +1 @@
-0.9.32
+0.9.33

data/{lib/typus/templates → generators/typus/templates/auto}/index.html.erb

@@ -6,6 +6,6 @@
 
 <!-- Content -->
 
-<h2>Resource#index</h2>
+<h2><%= params[:controller].split('/').last.titleize.capitalize %></h2>
 
-<p>Find me in app/views/<%= params[:controller] %>/index.html.erb</p>
+<p>Find me in app/views/<%= params[:controller] %>/index.html.erb</p>

data/{lib/typus/templates → generators/typus/templates/auto}/resource_controller_test.rb.erb

@@ -1,5 +1,6 @@
 require 'test_helper'
 
+# ControllerTest generated by Typus, use it to test the extended admin functionality.
 class Admin::<%= model.pluralize %>ControllerTest < ActionController::TestCase
 
   # Replace this with your real tests.

data/generators/typus/typus_generator.rb

@@ -1,3 +1,5 @@
+require 'ftools'
+
 class TypusGenerator < Rails::Generator::Base
 
   def manifest
@@ -10,14 +12,14 @@ 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 }
-      ar_models = []
+      @ar_models = []
 
       models.each do |model|
         begin
           klass = model.constantize
           active_record_model = klass.superclass.equal?(ActiveRecord::Base) && !klass.abstract_class?
           active_record_model_with_sti = klass.superclass.superclass.equal?(ActiveRecord::Base)
-          ar_models << klass if active_record_model || active_record_model_with_sti
+          @ar_models << klass if active_record_model || active_record_model_with_sti
         rescue Exception => error
           puts "=> [typus] #{error.message} on '#{model.class.name}'."
           exit
@@ -30,7 +32,7 @@ class TypusGenerator < Rails::Generator::Base
 
       configuration = { :base => '', :roles => '' }
 
-      ar_models.sort{ |x,y| x.class_name <=> y.class_name }.each do |model|
+      @ar_models.sort{ |x,y| x.class_name <=> y.class_name }.each do |model|
 
         # Detect all relationships except polymorphic belongs_to using reflection.
         relationships = [ :belongs_to, :has_and_belongs_to_many, :has_many, :has_one ].map do |relationship|
@@ -118,6 +120,42 @@ class TypusGenerator < Rails::Generator::Base
         m.file file, file
       end
 
+      %w( app/views/admin app/controllers/admin test/functional/admin ).each do |folder|
+        FileUtils.mkdir_p(folder) unless File.directory?(folder)
+      end
+
+      ##
+      # Generate:
+      #   `app/controllers/admin/#{resource}_controller.rb`
+      #   `test/functional/admin/#{resource}_controller_test.rb`
+      #
+      Typus.models.each do |model|
+
+        m.template "auto/resources_controller.rb.erb", 
+                   "app/controllers/admin/#{model.tableize}_controller.rb", 
+                   :assigns => { :model => model }
+
+        m.template "auto/resource_controller_test.rb.erb", 
+                   "test/functional/admin/#{model.tableize}_controller_test.rb", 
+                   :assigns => { :model => model }
+
+      end
+
+      ##
+      # Generate controllers for tableless models.
+      #
+      Typus.resources.each do |resource|
+
+        m.template "auto/resource_controller.rb.erb", 
+                   "app/controllers/admin/#{resource.underscore}_controller.rb", 
+                   :assigns => { :resource => resource }
+
+        views_folder = "app/views/admin/#{resource.underscore}"
+        FileUtils.mkdir_p(views_folder) unless File.directory?(views_folder)
+        m.file "auto/index.html.erb", "#{views_folder}/index.html.erb"
+
+      end
+
       # Migration file
 
       m.migration_template 'db/create_typus_users.rb', 'db/migrate', 

data/lib/typus.rb

@@ -70,11 +70,6 @@ module Typus
 
     def boot!
 
-      commands = [ 'script/generate', 
-                   'script/destroy' ]
-
-      return if commands.include?($0)
-
       if testing?
         Typus::Configuration.options[:config_folder] = 'vendor/plugins/typus/test/config/working'
       end
@@ -110,11 +105,6 @@ module Typus
       require 'vendor/paginator'
       require 'vendor/rss_parser'
 
-      commands = [ '/usr/local/bin/thin', 
-                   'script/server' ]
-
-      generator if commands.include?($0)
-
     end
 
   end

data/typus.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typus}
-  s.version = "0.9.32"
+  s.version = "0.9.33"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesc Esplugas"]
@@ -64,6 +64,10 @@ Gem::Specification.new do |s|
      "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",
@@ -106,7 +110,6 @@ Gem::Specification.new do |s|
      "lib/typus/extensions/routes.rb",
      "lib/typus/extensions/routes_hack.rb",
      "lib/typus/format.rb",
-     "lib/typus/generator.rb",
      "lib/typus/hash.rb",
      "lib/typus/object.rb",
      "lib/typus/preferences.rb",
@@ -114,10 +117,6 @@ 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: typus
 version: !ruby/object:Gem::Version 
-  version: 0.9.32
+  version: 0.9.33
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -70,6 +70,10 @@ files:
 - 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
@@ -112,7 +116,6 @@ files:
 - lib/typus/extensions/routes.rb
 - lib/typus/extensions/routes_hack.rb
 - lib/typus/format.rb
-- lib/typus/generator.rb
 - lib/typus/hash.rb
 - lib/typus/object.rb
 - lib/typus/preferences.rb
@@ -120,10 +123,6 @@ 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

data/lib/typus/generator.rb

@@ -1,81 +0,0 @@
-require 'ftools'
-
-module Typus
-
-  def self.generator
-
-    # Create needed folders if doesn't exist.
-    admin_controllers_folder = "#{Rails.root}/app/controllers/admin"
-    admin_views_folder = "#{Rails.root}/app/views/admin"
-
-    [ admin_controllers_folder, admin_views_folder ].each do |folder|
-      Dir.mkdir(folder) unless File.directory?(folder)
-    end
-
-    # Create test/functional/admin if doesn't exist.
-    admin_controller_tests_folder = "#{Rails.root}/test/functional/admin"
-    if File.directory?("#{Rails.root}/test")
-      Dir.mkdir(admin_controller_tests_folder) unless File.directory?(admin_controller_tests_folder)
-    end
-
-    # Get a list of controllers under `app/controllers/admin`.
-    admin_controllers = Dir["#{Rails.root}/vendor/plugins/*/app/controllers/admin/*.rb", "#{admin_controllers_folder}/*.rb"]
-    admin_controllers = admin_controllers.map { |i| File.basename(i) }
-
-    # Get a list of functional tests under `test/functional/admin`.
-    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.
-    resources.each do |resource|
-
-      controller_filename = "#{resource.underscore}_controller.rb"
-      controller_location = "#{admin_controllers_folder}/#{controller_filename}"
-
-      if !admin_controllers.include?(controller_filename)
-        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 }
-      end
-
-      # And now we create the view.
-      view_folder = "#{admin_views_folder}/#{resource.underscore}"
-      view_filename = "index.html.erb"
-
-      if !File.exist?("#{view_folder}/#{view_filename}")
-        Dir.mkdir(view_folder) unless File.directory?(view_folder)
-        origin = "#{File.dirname(__FILE__)}/templates/index.html.erb"
-        destination = "#{view_folder}/#{view_filename}"
-        File.copy(origin, destination)
-      end
-
-    end
-
-    # Generate:
-    #   `app/controllers/admin/#{resource}_controller.rb`
-    #   `test/functional/admin/#{resource}_controller_test.rb`
-    models.each do |model|
-
-      controller_filename = "#{model.tableize}_controller.rb"
-      controller_location = "#{admin_controllers_folder}/#{controller_filename}"
-
-      if !admin_controllers.include?(controller_filename)
-        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 }
-      end
-
-      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")
-        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 }
-      end
-
-    end
-
-  end
-
-end