radiant 0.6.9 → 0.7.0

data/lib/generators/extension/templates/extension.rb

@@ -7,7 +7,9 @@ class <%= class_name %> < Radiant::Extension
   url "http://yourwebsite.com/<%= file_name %>"
   
   # define_routes do |map|
-  #   map.connect 'admin/<%= file_name %>/:action', :controller => 'admin/<%= file_name %>'
+  #   map.namespace :admin, :member => { :remove => :get } do |admin|
+  #     admin.resources :<%= file_name %>
+  #   end
   # end
   
   def activate
@@ -18,4 +20,4 @@ class <%= class_name %> < Radiant::Extension
     # admin.tabs.remove "<%= extension_name %>"
   end
   
-end
+end

data/lib/generators/extension/templates/spec_helper.rb

@@ -11,9 +11,8 @@ unless defined? RADIANT_ROOT
 end
 require "#{RADIANT_ROOT}/spec/spec_helper"
 
-if File.directory?(File.dirname(__FILE__) + "/scenarios")
-  Scenario.load_paths.unshift File.dirname(__FILE__) + "/scenarios"
-end
+Dataset::Resolver.default << (File.dirname(__FILE__) + "/datasets")
+
 if File.directory?(File.dirname(__FILE__) + "/matchers")
   Dir[File.dirname(__FILE__) + "/matchers/*.rb"].each {|file| require file }
 end

data/lib/generators/extension/templates/tasks.rake

@@ -15,10 +15,10 @@ namespace :radiant do
       desc "Copies public assets of the <%= extension_name %> to the instance public/ directory."
       task :update => :environment do
         is_svn_or_dir = proc {|path| path =~ /\.svn/ || File.directory?(path) }
+        puts "Copying assets from <%= class_name %>"
         Dir[<%= class_name %>.root + "/public/**/*"].reject(&is_svn_or_dir).each do |file|
           path = file.sub(<%= class_name %>.root, '')
           directory = File.dirname(path)
-          puts "Copying #{path}..."
           mkdir_p RAILS_ROOT + directory
           cp file, RAILS_ROOT + path
         end

data/lib/generators/extension_controller/extension_controller_generator.rb

@@ -4,6 +4,7 @@ require 'rails_generator/generators/components/controller/controller_generator'
 class ExtensionControllerGenerator < ControllerGenerator
   
   attr_accessor :extension_name
+  default_options :with_test_unit => false
   
   def initialize(runtime_args, runtime_options = {})
     runtime_args = runtime_args.dup
@@ -50,8 +51,8 @@ class ExtensionControllerGenerator < ControllerGenerator
         m.template 'view_spec.rb',
           File.join('spec/views', class_path, file_name, "#{action}_view_spec.rb"),
           :assigns => { :action => action, :model => file_name }
-        path = File.join('app/views', class_path, file_name, "#{action}.rhtml")
-        m.template 'controller:view.rhtml',
+        path = File.join('app/views', class_path, file_name, "#{action}.html.erb")
+        m.template 'controller:view.html.erb',
           path,
           :assigns => { :action => action, :path => path }
       end
@@ -71,6 +72,13 @@ class ExtensionControllerGenerator < ControllerGenerator
   end
   
   def extension_uses_rspec?
-    File.exists?(File.join(destination_root, 'spec'))
+    File.exists?(File.join(destination_root, 'spec')) && !options[:with_test_unit]
+  end
+  
+  def add_options!(opt)
+    opt.separator ''
+    opt.separator 'Options:'
+    opt.on("--with-test-unit", 
+           "Use Test::Unit tests instead sof RSpec.") { |v| options[:with_test_unit] = v }
   end
 end

data/lib/generators/extension_controller/templates/controller.rb

@@ -1,8 +1,4 @@
 class <%= class_name %>Controller < ApplicationController
-<% if options[:scaffold] -%>
-  scaffold :<%= singular_name %>
-
-<% end -%>
   # Remove this line if your controller should only be accessible to users
   # that are logged in:
   no_login_required

data/lib/generators/extension_controller/templates/functional_test.rb

@@ -3,13 +3,7 @@ require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_hel
 # Re-raise errors caught by the controller.
 <%= class_name %>Controller.class_eval { def rescue_action(e) raise e end }
 
-class <%= class_name %>ControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = <%= class_name %>Controller.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
+class <%= class_name %>ControllerTest < ActionController::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true

data/lib/generators/extension_mailer/USAGE

@@ -0,0 +1,17 @@
+Description:
+    Stubs out a new mailer and its views for the given extension.
+    Pass the mailer name, either CamelCased or under_scored, 
+    and an optional list of emails as arguments.
+
+    This generates a mailer class in app/models, view templates in
+    app/views/mailer_name, a unit test in test/unit, and fixtures in
+    test/fixtures.
+
+Example:
+    `./script/generate extension_mailer MyExt Notifications signup forgot_password invoice`
+
+    creates a Notifications mailer class, views, test, and fixtures:
+        Mailer:     vendor/my_ext/app/models/notifications.rb
+        Views:      vendor/my_ext/app/views/notifications/signup.erb [...]
+        Test:       vendor/my_ext/test/unit/test/unit/notifications_test.rb
+        Fixtures:   vendor/my_ext/test/fixtures/notifications/signup [...]

data/lib/generators/extension_mailer/extension_mailer_generator.rb

@@ -0,0 +1,68 @@
+require 'rails_generator/base'
+require 'rails_generator/generators/components/mailer/mailer_generator'
+
+class ExtensionMailerGenerator < MailerGenerator
+  
+  attr_accessor :extension_name
+  default_options :with_test_unit => false
+  
+  def initialize(runtime_args, runtime_options = {})
+    runtime_args = runtime_args.dup
+    @extension_name = runtime_args.shift
+    super(runtime_args, runtime_options)
+  end
+  
+  def manifest
+    if extension_uses_rspec?
+      rspec_manifest
+    else
+      super
+    end
+  end
+  
+  def rspec_manifest
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions class_path, class_name
+
+      # Mailer, view, test, and fixture directories.
+      m.directory File.join('app/models', class_path)
+      m.directory File.join('app/views', file_path)
+
+      # Mailer class and unit test.
+      m.template "mailer:mailer.rb",    File.join('app/models', class_path, "#{file_name}.rb")
+
+      # View template and fixture for each action.
+      actions.each do |action|
+        relative_path = File.join(file_path, action)
+        view_path     = File.join('app/views', "#{relative_path}.erb")
+
+        m.template "mailer:view.erb", view_path,
+                   :assigns => { :action => action, :path => view_path }
+      end
+    end
+  end
+  
+  def banner
+    "Usage: #{$0} #{spec.name} ExtensionName #{spec.name.camelize}Name [options]"
+  end
+  
+  def extension_path
+    File.join('vendor', 'extensions', @extension_name.underscore)
+  end
+  
+  def destination_root
+    File.join(RAILS_ROOT, extension_path)
+  end
+  
+  def extension_uses_rspec?
+    File.exists?(File.join(destination_root, 'spec')) && !options[:with_test_unit]
+  end
+  
+  def add_options!(opt)
+    opt.separator ''
+    opt.separator 'Options:'
+    opt.on("--with-test-unit", 
+           "Use Test::Unit tests instead sof RSpec.") { |v| options[:with_test_unit] = v }
+  end
+end

data/lib/generators/extension_mailer/templates/fixture.erb

@@ -0,0 +1,3 @@
+<%= class_name %>#<%= action %>
+
+Find me in <%= path %>

data/lib/generators/extension_mailer/templates/mailer.rb

@@ -0,0 +1,15 @@
+class <%= class_name %> < ActionMailer::Base
+  
+<% for action in actions -%>
+
+  def <%= action %>(sent_at = Time.now)
+    subject    '<%= class_name %>#<%= action %>'
+    recipients ''
+    from       ''
+    sent_on    sent_at
+    
+    body       :greeting => 'Hi,'
+  end
+<% end -%>
+
+end

data/lib/generators/extension_mailer/templates/unit_test.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
+
+class <%= class_name %>Test < ActionMailer::TestCase
+  tests <%= class_name %>
+<% for action in actions -%>
+  def test_<%= action %>
+    @expected.subject = '<%= class_name %>#<%= action %>'
+    @expected.body    = read_fixture('<%= action %>')
+    @expected.date    = Time.now
+
+    assert_equal @expected.encoded, <%= class_name %>.create_<%= action %>(@expected.date).encoded
+  end
+
+<% end -%>
+<% if actions.blank? -%>
+  # replace this with your real tests
+  def test_truth
+    assert true
+  end
+<% end -%>
+end

data/lib/generators/extension_mailer/templates/view.erb

@@ -0,0 +1,3 @@
+<%= class_name %>#<%= action %>
+
+Find me in <%= path %>

data/lib/generators/extension_migration/USAGE

@@ -0,0 +1,34 @@
+Description:
+    The extension_migration generator creates a stub for a new migration for an 
+    extension.
+
+    The generator takes the extension name, a migration name as its arguments,
+    and an optional list of attribute pairs as arguments. The migration name 
+    may be given in CamelCase or under_score.
+
+    You can name your migration in either of these formats to generate add/remove
+    column lines from supplied attributes: AddColumnsToTable or RemoveColumnsFromTable
+
+    A migration class is generated in vendor/extensions/extension_name/db/migrate 
+    prefixed by a timestamp of the current date and time. 
+
+Examples:
+    `./script/generate extension_migration MyExt AddSslFlag`
+
+    If the current date is May 14, 2008 and the current time 09:09:12, this creates the AddSslFlag migration
+    vendor/extensions/my_ext/db/migrate/20080514090912_add_ssl_flag.rb
+
+    `./script/generate migration MyExt AddTitleBodyToPost title:string body:text published:boolean`
+    
+    This will create the AddTitleBodyToPost in vendor/extensions/my_ext/db/migrate/20080514090912_add_title_body_to_post.rb
+    with this in the Up migration:
+
+      add_column :posts, :title, :string  
+      add_column :posts, :body, :text  
+      add_column :posts, :published, :boolean
+
+    And this in the Down migration:
+    
+      remove_column :posts, :published  
+      remove_column :posts, :body  
+      remove_column :posts, :title

data/lib/generators/extension_migration/extension_migration_generator.rb

@@ -0,0 +1,25 @@
+require 'rails_generator/base'
+require 'rails_generator/generators/components/migration/migration_generator'
+
+class ExtensionMigrationGenerator < MigrationGenerator
+  
+  attr_accessor :extension_name
+  
+  def initialize(runtime_args, runtime_options = {})
+    runtime_args = runtime_args.dup
+    @extension_name = runtime_args.shift
+    super(runtime_args, runtime_options)
+  end
+  
+  def banner
+    "Usage: #{$0} extension_migration ExtensionName MigrationName [field:type, field:type]"
+  end
+  
+  def extension_path
+    File.join('vendor', 'extensions', @extension_name.underscore)
+  end
+  
+  def destination_root
+    File.join(RAILS_ROOT, extension_path)
+  end
+end

data/lib/generators/extension_migration/templates/migration.rb

@@ -0,0 +1,11 @@
+class <%= class_name.underscore.camelize %> < ActiveRecord::Migration
+  def self.up<% attributes.each do |attribute| %>
+    <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><% end -%>
+  <%- end %>
+  end
+
+  def self.down<% attributes.reverse.each do |attribute| %>
+    <%= migration_action == 'add' ? 'remove' : 'add' %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'remove' %>, :<%= attribute.type %><% end -%>
+  <%- end %>
+  end
+end

data/lib/generators/extension_model/extension_model_generator.rb

@@ -4,6 +4,7 @@ require 'rails_generator/generators/components/model/model_generator'
 class ExtensionModelGenerator < ModelGenerator
   
   attr_accessor :extension_name
+  default_options :with_test_unit => false
   
   def initialize(runtime_args, runtime_options = {})
     runtime_args = runtime_args.dup
@@ -55,6 +56,13 @@ class ExtensionModelGenerator < ModelGenerator
   end
   
   def extension_uses_rspec?
-    File.exists?(File.join(destination_root, 'spec'))
+    File.exists?(File.join(destination_root, 'spec')) && !options[:with_test_unit]
   end
-end
+  
+  def add_options!(opt)
+    opt.separator ''
+    opt.separator 'Options:'
+    opt.on("--with-test-unit", 
+           "Use Test::Unit tests instead sof RSpec.") { |v| options[:with_test_unit] = v }
+  end
+end

data/lib/generators/extension_model/templates/fixtures.yml

@@ -1,11 +1,19 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+<% unless attributes.empty? -%>
 one:
-  id: 1
 <% for attribute in attributes -%>
   <%= attribute.name %>: <%= attribute.default %>
 <% end -%>
+
 two:
-  id: 2
 <% for attribute in attributes -%>
   <%= attribute.name %>: <%= attribute.default %>
-<% end -%>
+<% end -%>
+<% else -%>
+# one:
+#   column: value
+#
+# two:
+#   column: value
+<% end -%>

data/lib/generators/extension_model/templates/migration.rb

@@ -2,7 +2,10 @@ class <%= migration_name %> < ActiveRecord::Migration
   def self.up
     create_table :<%= table_name %> do |t|
 <% for attribute in attributes -%>
-      t.column :<%= attribute.name %>, :<%= attribute.type %>
+      t.<%= attribute.type %> :<%= attribute.name %>
+<% end -%>
+<% unless options[:skip_timestamps] %>
+      t.timestamps
 <% end -%>
     end
   end

data/lib/generators/extension_model/templates/unit_test.rb

@@ -1,10 +1,8 @@
 require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
 
-class <%= class_name %>Test < Test::Unit::TestCase
-  fixtures :<%= table_name %>
-
+class <%= class_name %>Test < ActiveSupport::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true
   end
-end
+end

data/lib/generators/generator_base_extension.rb

@@ -4,7 +4,6 @@ module Radiant
     def self.included(base)
       base.class_eval %{
         alias_method_chain :existing_migrations, :extensions
-        alias_method_chain :current_migration_number, :extensions
       }
     end
 
@@ -12,12 +11,6 @@ module Radiant
       Dir.glob("#{destination_path(@migration_directory)}/[0-9]*_*.rb").grep(/[0-9]+_#{file_name}.rb$/)
     end
 
-    def current_migration_number_with_extensions
-      Dir.glob("#{destination_path(@migration_directory)}/[0-9]*.rb").inject(0) do |max, file_path|
-        n = File.basename(file_path).split('_', 2).first.to_i
-        if n > max then n else max end
-      end
-    end
   end
 end
 Rails::Generator::Commands::Base.class_eval { include Radiant::GeneratorBaseExtension }

data/lib/generators/instance/templates/instance_boot.rb

@@ -3,10 +3,19 @@
 
 RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/..") unless defined?(RAILS_ROOT)
 
+module Rails
+  class << self
+    def vendor_rails?
+      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
+  end
+end
+
 module Radiant
   class << self
     def boot!
       unless booted?
+        preinitialize
         pick_boot.run
       end
     end
@@ -33,16 +42,23 @@ module Radiant
     def app?
       File.exist?("#{RAILS_ROOT}/lib/radiant.rb")
     end
+
+    def preinitialize
+      load(preinitializer_path) if File.exist?(preinitializer_path)
+    end
     
     def loaded_via_gem?
       pick_boot.is_a? GemBoot
     end
+
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
+    end
   end
 
   class Boot
     def run
       load_initializer
-      Radiant::Initializer.run(:set_load_path)
     end
     
     def load_initializer
@@ -53,6 +69,7 @@ module Radiant
         $stderr.puts %(Radiant could not be initialized. #{load_error_message})
         exit 1
       end
+      Radiant::Initializer.run(:set_load_path)
     end
   end
 
@@ -60,8 +77,10 @@ module Radiant
     def load_initializer
       $LOAD_PATH.unshift "#{RAILS_ROOT}/vendor/radiant/lib" 
       super
+      #require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      #Rails::Initializer.run(:install_gem_spec_stubs)
     end
-    
+        
     def load_error_message
       "Please verify that vendor/radiant contains a complete copy of the Radiant sources."
     end
@@ -72,7 +91,7 @@ module Radiant
       $LOAD_PATH.unshift "#{RAILS_ROOT}/lib" 
       super
     end
-    
+
     def load_error_message
       "Please verify that you have a complete copy of the Radiant sources."
     end
@@ -82,11 +101,12 @@ module Radiant
     def load_initializer
       self.class.load_rubygems
       load_radiant_gem
+      # require 'initializer'
       super
     end
-
+      
     def load_error_message
-      "Please reinstall the Radiant gem with the command 'gem install radiant'."
+     "Please reinstall the Radiant gem with the command 'gem install radiant'."
     end
 
     def load_radiant_gem
@@ -96,7 +116,7 @@ module Radiant
         gem 'radiant'
       end
     rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Radiant #{version} gem. Please `gem install -v=#{version} radiant`, update your RADIANT_GEM_VERSION setting in config/environment.rb for the Radiant version you do have installed, or comment out RADIANT_GEM_VERSION to use the latest version installed.)
+      $stderr.puts %(Missing the Radiant #{version} gem. Please `gem install -v=#{version} rails`, update your RADIANT_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RADIANT_GEM_VERSION to use the latest version installed.)
       exit 1
     end
 
@@ -129,7 +149,7 @@ module Radiant
       end
 
       def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RADIANT_GEM_VERSION\s*=\s*'([!~<>=]*\s*[\d.]+)'/
+        $1 if text =~ /^[^#]*RADIANT_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
       end
 
       private