fesplugas-typus 0.9.14 → 0.9.15

data/.gitignore

@@ -1,3 +1,4 @@
+*.swp
 *.db
 *.log
 _dashboard*

data/VERSION

@@ -1 +1 @@
-0.9.14
+0.9.15

data/app/controllers/admin/master_controller.rb

@@ -293,7 +293,7 @@ private
   end
 
   def set_tiny_mce
-    if !@resource[:class].typus_tiny_mce_fields.empty? && tiny_mce_plugin_installed?
+    if !@resource[:class].typus_tiny_mce_fields.empty? && defined?(TinyMCE)
       options = @resource[:class].typus_tiny_mce_options
       self.class.class_eval { uses_tiny_mce :options => options }
     end

data/app/helpers/typus_helper.rb

@@ -93,8 +93,7 @@ module TypusHelper
     resources_partials_path = 'admin/resources'
 
     partials = ActionController::Base.view_paths.map do |view_path|
-      path = Rails.vendor_rails? ? view_path.path : "#{Rails.root}/#{view_path}"
-      Dir["#{path}/#{partials_path}/*"].map { |f| File.basename(f, '.html.erb') }
+      Dir["#{view_path.path}/#{partials_path}/*"].map { |f| File.basename(f, '.html.erb') }
     end.flatten
     resources_partials = Dir["#{Rails.root}/app/views/#{resources_partials_path}/*"].map { |f| File.basename(f, '.html.erb') }
 
@@ -185,8 +184,4 @@ module TypusHelper
 
   end
 
-  def tiny_mce_plugin_installed?
-    defined?(TinyMCE)
-  end
-
 end

data/app/views/layouts/admin.html.erb

@@ -14,7 +14,7 @@
   <%= yield :stylesheets -%>
 
   <%= javascript_include_tag 'admin/application' %>
-  <%= include_tiny_mce_if_needed if tiny_mce_plugin_installed? %>
+  <%= include_tiny_mce_if_needed if defined?(TinyMCE) %>
   <%= yield :javascripts -%>
 
 </head>

data/generators/typus/typus_generator.rb

@@ -4,24 +4,17 @@ class TypusGenerator < Rails::Generator::Base
 
     record do |m|
 
-      ##
       # Default name for our application.
-      #
-
       application = Rails.root.basename
 
-      ##
-      # To create <tt>application.yml</tt> and <tt>application_roles.yml</tt> detect 
-      # available AR models on the application.
-      #
-
-      models = Dir["#{Rails.root}/app/models/*.rb"].collect { |x| File.basename(x) }
+      # 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 = []
 
       models.each do |model|
-        class_name = model.sub(/\.rb$/,'').classify
         begin
-          klass = class_name.constantize
+          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
@@ -30,13 +23,9 @@ class TypusGenerator < Rails::Generator::Base
         end
       end
 
-      ##
       # Configuration files
-      #
-
       config_folder = Typus::Configuration.options[:config_folder]
-      folder = "#{Rails.root}/#{config_folder}"
-      Dir.mkdir(folder) unless File.directory?(folder)
+      Dir.mkdir(config_folder) unless File.directory?(config_folder)
 
       configuration = { :base => '', :roles => '' }
 
@@ -58,10 +47,8 @@ class TypusGenerator < Rails::Generator::Base
 
         # Don't show `text` fields and timestamps in lists.
         list = model_columns.reject { |c| c.sql_type == 'text' || %w( created_at updated_at ).include?(c.name) }.map(&:name)
-
         # Don't show timestamps in forms.
         form = model_columns.reject { |c| %w( id created_at updated_at ).include?(c.name) }.map(&:name)
-
         # Show all model columns in the show action.
         show = model_columns.map(&:name)
 
@@ -102,35 +89,28 @@ class TypusGenerator < Rails::Generator::Base
                    :assigns => { :configuration => configuration }
       end
 
-      ##
-      # Initializers
-      #
+      # Initializer
 
-      m.template 'config/initializers/typus.rb', 'config/initializers/typus.rb', 
-                 :assigns => { :application => application }
+      [ 'config/initializers/typus.rb' ].each do |initializer|
+        m.template initializer, initializer, :assigns => { :application => application }
+      end
 
-      ##
-      # Public folders
-      #
+      # Assets
 
-      [ "#{Rails.root}/public/stylesheets/admin", 
-        "#{Rails.root}/public/javascripts/admin", 
-        "#{Rails.root}/public/images/admin" ].each do |folder|
-        Dir.mkdir(folder) unless File.directory?(folder)
-      end
+      [ 'public/stylesheets/admin', 
+        'public/javascripts/admin', 
+        'public/images/admin' ].each { |f| Dir.mkdir(f) unless File.directory?(f) }
 
-      m.file 'public/stylesheets/admin/screen.css', 'public/stylesheets/admin/screen.css'
-      m.file 'public/stylesheets/admin/reset.css', 'public/stylesheets/admin/reset.css'
-      m.file 'public/javascripts/admin/application.js', 'public/javascripts/admin/application.js'
+      [ 'public/stylesheets/admin/screen.css', 
+        '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|
-        base = File.basename(f)
-        m.file "public/images/admin/#{base}", "public/images/admin/#{base}"
+        file = "public/images/admin/#{File.basename(f)}"
+        m.file file, file
       end
 
-      ##
       # Migration file
-      #
 
       m.migration_template 'db/create_typus_users.rb', 'db/migrate', 
                             { :migration_file_name => 'create_typus_users' }

data/lib/typus/active_record.rb

@@ -102,7 +102,7 @@ module Typus
     end
 
     ##
-    #  Tiny_mce fields of the model
+    # Tiny_mce fields of the model
     #
     def typus_tiny_mce_fields
       Typus::Configuration.config[name]['fields']['options']['tiny_mce']['fields'].split(', ')
@@ -134,7 +134,7 @@ module Typus
     end
 
     ##
-    #  Extended actions for this model on Typus.
+    # Extended actions for this model on Typus.
     #
     def typus_actions_for(filter)
       Typus::Configuration.config[name]['actions'][filter.to_s].split(', ')

data/typus.gemspec

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

metadata

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