merb_activerecord 0.9.3 → 0.9.4

data/Rakefile

@@ -1,45 +1,64 @@
 require 'rubygems'
 require 'rake/gempackagetask'
+require "extlib"
+require 'merb-core/tasks/merb_rake_helper'
+require "spec/rake/spectask"
 
-PLUGIN = "merb_activerecord"
-NAME = "merb_activerecord"
-VERSION = "0.9.3"
-AUTHOR = "Duane Johnson"
-EMAIL = "canadaduane@gmail.com"
-HOMEPAGE = "http://merbivore.com"
-SUMMARY = "Merb plugin that provides ActiveRecord support for Merb"
+##############################################################################
+# Package && release
+##############################################################################
+RUBY_FORGE_PROJECT  = "merb"
+PROJECT_URL         = "http://merbivore.com"
+PROJECT_SUMMARY     = "Merb plugin that provides ActiveRecord support for Merb"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY
+
+GEM_AUTHOR = "Duane Johnson"
+GEM_EMAIL  = "canadaduane@gmail.com"
+
+GEM_NAME    = "merb_activerecord"
+PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.4") + PKG_BUILD
+
+RELEASE_NAME    = "REL #{GEM_VERSION}"
+
+require "extlib/tasks/release"
 
 spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = VERSION
+  s.rubyforge_project = RUBY_FORGE_PROJECT
+  s.name = GEM_NAME
+  s.version = GEM_VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency("merb-core", ">= 0.9.3")
-  s.require_path = "lib"
-  s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,activerecord_generators}/**/*")
-end
-
-windows = (PLATFORM =~ /win32|cygwin/) rescue nil
-
-SUDO = windows ? "" : "sudo"
+  s.summary = PROJECT_SUMMARY
+  s.description = PROJECT_DESCRIPTION
+  s.author = GEM_AUTHOR
+  s.email = GEM_EMAIL
+  s.homepage = PROJECT_URL
+  s.add_dependency('merb-core', '>= 0.9.4')
+  s.require_path = 'lib'
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")  end
 
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-desc "Install merb_activerecord"
-task :install => :package do
-  sh %{#{SUDO} gem install pkg/#{NAME}-#{VERSION} --no-rdoc --no-ri --no-update-sources}
+desc "Install the gem"
+task :install => [:package] do
+  sh %{#{sudo} gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}
+end
+
+namespace :jruby do
+
+  desc "Run :package and install the resulting .gem with jruby"
+  task :install => :package do
+    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
+  end
+
 end
 
-desc "Release the current version on rubyforge"
-task :release => :package do
-  sh %{rubyforge add_release merb #{PLUGIN} #{VERSION} pkg/#{NAME}-#{VERSION}.gem}
+desc "Run all specs"
+Spec::Rake::SpecTask.new("specs") do |t|
+  t.spec_opts = ["--format", "specdoc", "--colour"]
+  t.spec_files = Dir["spec/**/*_spec.rb"].sort
 end

data/lib/active_record/merbtasks.rb

@@ -57,7 +57,7 @@ namespace :db do
     when 'mysql'
       ActiveRecord::Base.connection.drop_database config[:database]
     when /^sqlite/
-      FileUtils.rm(File.join(RAILS_ROOT, config[:database]))
+      FileUtils.rm(File.join(Merb.root, config[:database]))
     when 'postgresql'
       ActiveRecord::Base.clear_active_connections!    
       `dropdb "#{config[:database]}"`
@@ -170,8 +170,9 @@ namespace :db do
       require 'active_record/fixtures'
       config = Merb::Orms::ActiveRecord.configurations[Merb.environment.to_sym]
       ActiveRecord::Base.establish_connection(config)
-      (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Merb.root, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
-        Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*'))
+      test_folder = (Merb.test_framework_generator_scope == :rspec) ? 'spec' : 'test'
+      (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Merb.root, test_folder, 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+        Fixtures.create_fixtures(File.join(test_folder, 'fixtures'), File.basename(fixture_file, '.*'))
       end
     end
   end
@@ -315,13 +316,10 @@ namespace :db do
   end
 
   namespace :sessions do
-  #  desc "Creates a sessions migration for use with CGI::Session::ActiveRecordStore"
-  #  task :create => :environment do
-  #    raise "Task unavailable to this database (no migration support)" unless ActiveRecord::Base.connection.supports_migrations?
-  #    require 'rails_generator'
-  #    require 'rails_generator/scripts/generate'
-  #    Rails::Generator::Scripts::Generate.new.run(["session_migration", ENV["MIGRATION"] || "AddSessions"])
-  #  end
+    desc "Create sessions table"
+    task :create => :merb_start do
+      Merb::ActiveRecordSession.create_table!
+    end
 
     desc "Clear the sessions table"
     task :clear => :merb_start do

data/lib/generators/migration.rb

@@ -0,0 +1,4 @@
+Merb::Generators::MigrationGenerator.template :migration_activerecord, :orm => :activerecord do
+  source(File.dirname(__FILE__), 'templates/migration/schema/migrations/%file_name%.rb')
+  destination("#{destination_directory}/#{file_name}.rb")
+end

data/lib/generators/model.rb

@@ -0,0 +1,8 @@
+Merb::Generators::ModelGenerator.template :model_activerecord, :orm => :activerecord do
+  source(File.dirname(__FILE__), "templates/model/app/models/%file_name%.rb")
+  destination("app/models", base_path, "#{file_name}.rb")
+end
+    
+Merb::Generators::ModelGenerator.invoke :migration, :orm => :activerecord do |generator|
+  generator.new(destination_root, options.merge(:model => true), file_name, attributes)
+end

data/lib/generators/resource_controller.rb

@@ -0,0 +1,12 @@
+Merb::Generators::ResourceControllerGenerator.template :controller_activerecord, :orm => :activerecord do
+  source(File.dirname(__FILE__), "templates/resource_controller/app/controllers/%file_name%.rb")
+  destination("app/controllers", base_path, "#{file_name}.rb")
+end
+
+[:index, :show, :edit, :new].each do |view|
+  Merb::Generators::ResourceControllerGenerator.template "view_#{view}_activerecord".to_sym,
+      :orm => :activerecord, :template_engine => :erb do
+    source(File.dirname(__FILE__), "templates/resource_controller/app/views/%file_name%/#{view}.html.erb")
+    destination("app/views", base_path, "#{file_name}/#{view}.html.erb")
+  end
+end

data/lib/generators/session_migration.rb

@@ -0,0 +1,4 @@
+Merb::Generators::SessionMigrationGenerator.template :session_migration_activerecord, :orm => :activerecord do
+  source(File.dirname(__FILE__), 'templates/session_migration/schema/migrations/%version%_sessions.rb')
+  destination("schema/migrations/#{version}_sessions.rb")
+end

data/lib/generators/templates/migration/schema/migrations/%file_name%.rb

@@ -0,0 +1,19 @@
+class <%= class_name %> < ActiveRecord::Migration
+  def self.up
+<% if model -%>
+    create_table :<%= table_name %> do |t|
+<% attributes.each do |name, type| -%>
+      t.<%= name %> :<%= type %> 
+<% end -%>
+  
+      t.timestamps
+    end
+<% end -%> 
+  end
+
+  def self.down
+<% if model -%>
+    drop_table :<%= table_name %>
+<% end -%>
+  end
+end

data/lib/generators/templates/model/app/models/%file_name%.rb

@@ -0,0 +1,4 @@
+<% with_modules(modules) do -%>
+class <%= class_name %> < ActiveRecord::Base
+end
+<% end -%>

data/lib/generators/templates/resource_controller/app/controllers/%file_name%.rb

@@ -0,0 +1,57 @@
+class <%= class_name %> < Application
+  # provides :xml, :yaml, :js
+
+  def index
+    @<%= plural_model %> = <%= model_class_name %>.find(:all)
+    display @<%= plural_model %>
+  end
+
+  def show
+    @<%= singular_model %> = <%= model_class_name %>.find_by_id(params[:id])
+    raise NotFound unless @<%= singular_model %>
+    display @<%= singular_model %>
+  end
+
+  def new
+    only_provides :html
+    @<%= singular_model %> = <%= model_class_name %>.new(params[:<%= singular_model %>])
+    render
+  end
+
+  def create
+    @<%= singular_model %> = <%= model_class_name %>.new(params[:<%= singular_model %>])
+    if @<%= singular_model %>.save
+      redirect url(:<%= (modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
+    else
+      render :new
+    end
+  end
+
+  def edit
+    only_provides :html
+    @<%= singular_model %> = <%= model_class_name %>.find_by_id(params[:id])
+    raise NotFound unless @<%= singular_model %>
+    render
+  end
+
+  def update
+    @<%= singular_model %> = <%= model_class_name %>.find_by_id(params[:id])
+    raise NotFound unless @<%= singular_model %>
+    if @<%= singular_model %>.update_attributes(params[:<%= singular_model %>])
+      redirect url(:<%= (modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
+    else
+      raise BadRequest
+    end
+  end
+
+  def destroy
+    @<%= singular_model %> = <%= model_class_name %>.find_by_id(params[:id])
+    raise NotFound unless @<%= singular_model %>
+    if @<%= singular_model %>.destroy
+      redirect url(:<%= (modules.collect{|m| m.downcase} << singular_model).join("_") %>s)
+    else
+      raise BadRequest
+    end
+  end
+
+end

data/lib/generators/templates/resource_controller/app/views/%file_name%/edit.html.erb

@@ -0,0 +1,3 @@
+<h1><%= class_name %> controller, edit action</h1>
+
+<p>Edit this file in <tt>app/views/<%= file_name %>/edit.html.erb</tt></p>

data/lib/generators/templates/resource_controller/app/views/%file_name%/index.html.erb

@@ -0,0 +1,3 @@
+<h1><%= class_name %> controller, index action</h1>
+
+<p>Edit this file in <tt>app/views/<%= file_name %>/index.html.erb</tt></p>

data/lib/generators/templates/resource_controller/app/views/%file_name%/new.html.erb

@@ -0,0 +1,3 @@
+<h1><%= class_name %> controller, new action</h1>
+
+<p>Edit this file in <tt>app/views/<%= file_name %>/new.html.erb</tt></p>

data/lib/generators/templates/resource_controller/app/views/%file_name%/show.html.erb

@@ -0,0 +1,3 @@
+<h1><%= class_name %> controller, show action</h1>
+
+<p>Edit this file in <tt>app/views/<%= file_name %>/show.html.erb</tt></p>

data/lib/generators/templates/session_migration/schema/migrations/%version%_sessions.rb

@@ -0,0 +1,14 @@
+class DatabaseSessions < ActiveRecord::Migration
+  def self.up
+    create_table :sessions do |t|
+      t.column :session_id, :string
+      t.column :data,       :text
+    end
+    add_index :sessions, :session_id
+  end
+
+  def self.down
+    remove_index :sessions, :session_id
+    drop_table :sessions
+  end
+end

data/lib/merb/orms/active_record/connection.rb

@@ -31,7 +31,13 @@ module Merb
         end
 
         def config
-          @config ||= (Merb::Plugins.config[:merb_active_record] = configurations[Merb.environment.to_sym])
+          #If Merb#runs_like specifies a differnt db env, use it.
+          env_sym = (Merb.environment_info.nil?) ?
+            Merb.environment.to_sym :
+            Merb.environment_info[:db_env].to_sym
+
+          raise ArgumentError, "missing environment :#{Merb.environment} in config file #{config_file}" unless configurations.key?(env_sym)
+          @config ||= (Merb::Plugins.config[:merb_active_record] = configurations[env_sym])
         end
 
         def configurations
@@ -62,7 +68,7 @@ module Merb
           else
             copy_sample_config
             Merb.logger.error! "No database.yml file found in #{Merb.root}/config."
-            Merb.logger.error! "A sample file was created called database.sample.yml for you to copy and edit."
+            Merb.logger.error! "A sample file was created called database.yml.sample for you to copy and edit."
             exit(1)
           end
         end

data/lib/merb/orms/active_record/database.yml.sample

@@ -15,4 +15,7 @@
 
 :production:
   <<: *defaults
-  :database: sample_production
+  :database: sample_production
+  
+:rake:
+  <<: *defaults

data/lib/merb/session/active_record_session.rb

@@ -47,7 +47,7 @@ module Merb
       end
     
       # Don't try to reload ARStore::Session in dev mode.
-      def reloadable? #:nodoc:
+      def reloadable?
         false
       end
 

data/lib/merb_activerecord.rb

@@ -5,7 +5,7 @@ if defined?(Merb::Plugins)
   
   class Merb::Orms::ActiveRecord::Connect < Merb::BootLoader
 
-    after BeforeAppRuns
+    after BeforeAppLoads
 
     def self.run
       Merb::Orms::ActiveRecord.connect
@@ -13,5 +13,11 @@ if defined?(Merb::Plugins)
     end
 
   end
+  
+  generators = File.join(File.dirname(__FILE__), 'generators')
+  Merb.add_generators generators / :migration
+  Merb.add_generators generators / :model
+  Merb.add_generators generators / :resource_controller
+  Merb.add_generators generators / :session_migration
 
 end

metadata

@@ -1,25 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: merb_activerecord
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Duane Johnson
-autorequire: merb_activerecord
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -05:00
+date: 2008-08-13 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 description: Merb plugin that provides ActiveRecord support for Merb
 email: canadaduane@gmail.com
@@ -38,6 +39,34 @@ files:
 - TODO
 - lib/active_record
 - lib/active_record/merbtasks.rb
+- lib/generators
+- lib/generators/migration.rb
+- lib/generators/model.rb
+- lib/generators/resource_controller.rb
+- lib/generators/session_migration.rb
+- lib/generators/templates
+- lib/generators/templates/migration
+- lib/generators/templates/migration/schema
+- lib/generators/templates/migration/schema/migrations
+- lib/generators/templates/migration/schema/migrations/%file_name%.rb
+- lib/generators/templates/model
+- lib/generators/templates/model/app
+- lib/generators/templates/model/app/models
+- lib/generators/templates/model/app/models/%file_name%.rb
+- lib/generators/templates/resource_controller
+- lib/generators/templates/resource_controller/app
+- lib/generators/templates/resource_controller/app/controllers
+- lib/generators/templates/resource_controller/app/controllers/%file_name%.rb
+- lib/generators/templates/resource_controller/app/views
+- lib/generators/templates/resource_controller/app/views/%file_name%
+- lib/generators/templates/resource_controller/app/views/%file_name%/edit.html.erb
+- lib/generators/templates/resource_controller/app/views/%file_name%/index.html.erb
+- lib/generators/templates/resource_controller/app/views/%file_name%/new.html.erb
+- lib/generators/templates/resource_controller/app/views/%file_name%/show.html.erb
+- lib/generators/templates/session_migration
+- lib/generators/templates/session_migration/schema
+- lib/generators/templates/session_migration/schema/migrations
+- lib/generators/templates/session_migration/schema/migrations/%version%_sessions.rb
 - lib/merb
 - lib/merb/orms
 - lib/merb/orms/active_record
@@ -48,40 +77,6 @@ files:
 - lib/merb_activerecord.rb
 - specs/merb_active_record_spec.rb
 - specs/spec_helper.rb
-- activerecord_generators/database_sessions_migration
-- activerecord_generators/database_sessions_migration/database_sessions_migration_generator.rb
-- activerecord_generators/database_sessions_migration/templates
-- activerecord_generators/database_sessions_migration/templates/sessions_migration.erb
-- activerecord_generators/database_sessions_migration/USAGE
-- activerecord_generators/migration
-- activerecord_generators/migration/migration_generator.rb
-- activerecord_generators/migration/templates
-- activerecord_generators/migration/templates/schema
-- activerecord_generators/migration/templates/schema/migrations
-- activerecord_generators/migration/templates/schema/migrations/%migration_file_name%.rb
-- activerecord_generators/migration/USAGE
-- activerecord_generators/model
-- activerecord_generators/model/model_generator.rb
-- activerecord_generators/model/templates
-- activerecord_generators/model/templates/app
-- activerecord_generators/model/templates/app/models
-- activerecord_generators/model/templates/app/models/%model_file_name%.rb
-- activerecord_generators/model/USAGE
-- activerecord_generators/resource_controller
-- activerecord_generators/resource_controller/resource_controller_generator.rb
-- activerecord_generators/resource_controller/templates
-- activerecord_generators/resource_controller/templates/app
-- activerecord_generators/resource_controller/templates/app/controllers
-- activerecord_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb
-- activerecord_generators/resource_controller/templates/app/helpers
-- activerecord_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb
-- activerecord_generators/resource_controller/templates/app/views
-- activerecord_generators/resource_controller/templates/app/views/%controller_file_name%
-- activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb
-- activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb
-- activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb
-- activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb
-- activerecord_generators/resource_controller/USAGE
 has_rdoc: true
 homepage: http://merbivore.com
 post_install_message: 
@@ -103,8 +98,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
+rubyforge_project: merb
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Merb plugin that provides ActiveRecord support for Merb

data/activerecord_generators/database_sessions_migration/USAGE

@@ -1,5 +0,0 @@
-Description:
-  
-  
-Usage:
-  

data/activerecord_generators/database_sessions_migration/database_sessions_migration_generator.rb

@@ -1,53 +0,0 @@
-class DatabaseSessionsMigrationGenerator < Merb::GeneratorBase
-  
-  default_options :author => nil
-
-  def initialize(runtime_args, runtime_options = {})
-    # put somthing into the runtime_args so that super doesn't show the 
-    # description
-    runtime_args.push ""
-    super
-    @name = 'database_sessions'
-  end
-
-  def manifest
-    record do |m|
-    # Ensure appropriate folder(s) exists
-    m.directory 'schema/migrations'
-
-    # Create stubs
-    highest_migration = Dir[Dir.pwd+'/schema/migrations/*'].map{|f| File.basename(f) =~ /^(\d+)/; $1}.max
-    filename = format("%03d_%s", (highest_migration.to_i+1), @name.snake_case)
-    m.template "sessions_migration.erb", "schema/migrations/#{filename}.rb"
-    puts banner
-
-    end
-  end
-
-  protected
-    def banner
-      <<-EOS
-A migration to add sessions to your database has been created.
-Run 'rake db:migrate' to add the sessions migration to your database.
-
-EOS
-    end
-
-    def add_options!(opts)
-      # opts.separator ''
-      # opts.separator 'Options:'
-      # For each option below, place the default
-      # at the top of the file next to "default_options"
-      # opts.on("-a", "--author=\"Your Name\"", String,
-      #         "Some comment about this option",
-      #         "Default: none") { |options[:author]| }
-      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
-    end
-    
-    def extract_options
-      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
-      # Templates can access these value via the attr_reader-generated methods, but not the
-      # raw instance variable value.
-      # @author = options[:author]
-    end
-end

data/activerecord_generators/database_sessions_migration/templates/sessions_migration.erb

@@ -1,15 +0,0 @@
-class DatabaseSessions < ActiveRecord::Migration
-  def self.up
-		create_table :sessions do |t|
-		  t.column :session_id, :text
-		  t.column :data,       :text
-		end
-  end
-
-  def self.down
-		drop_table :sessions
-  end
-end
-
-
-

data/activerecord_generators/migration/USAGE

@@ -1,5 +0,0 @@
-Description:
-  
-  
-Usage:
-  

data/activerecord_generators/migration/migration_generator.rb

@@ -1,42 +0,0 @@
-class MigrationGenerator < Merb::GeneratorBase
-  attr_reader :model_attributes, :model_class_name, :model_file_name, :table_name
-  
-  def initialize(args, runtime_args = {})
-    @base =                 File.dirname(__FILE__)
-    super
-    @model_file_name  =      args.shift.snake_case
-    @table_name       =      @model_file_name.pluralize
-    @model_class_name =     @model_file_name.to_const_string
-    @model_attributes =     Hash[*(args.map{|a| a.split(":") }.flatten)]
-  end
-  
-  def manifest
-    record do |m|
-      @m = m
-      
-      m.directory "schema/migrations"
-      
-      current_migration_number = Dir[Dir.pwd+'/schema/migrations/*'].map{|f| File.basename(f) =~ /^(\d+)/; $1}.max
-      @migration_file_name = format("%03d_%s", (current_migration_number.to_i+1), model_file_name) + "_migration"
-    
-      @assigns = {  :model_file_name  => model_file_name, 
-                    :model_attributes => model_attributes,
-                    :model_class_name => model_class_name,
-                    :table_name       => table_name,
-                    :migration_file_name => @migration_file_name
-                  }
-      copy_dirs
-      copy_files
-    end
-  end
-  
-  protected
-  def banner
-    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
-      Creates an Active Record Migration stub..
-
-      USAGE: #{spec.name}"
-    EOS
-  end
-      
-end

data/activerecord_generators/migration/templates/schema/migrations/%migration_file_name%.rb

@@ -1,17 +0,0 @@
-class <%= model_class_name %>Migration < ActiveRecord::Migration
-  def self.up
-    <%= "create_table :#{table_name} do |t|" if table_name %>
-<% for attribute in model_attributes -%>
-      t.<%= "%-11s" % attribute.last %> :<%= attribute.first %> 
-<% end -%>
-
-      t.timestamps
-    <%= "end" if table_name %> 
-  end
-
-  def self.down
-<% if table_name -%>
-    drop_table :<%= table_name %>
-<% end -%>
-  end
-end

data/activerecord_generators/model/USAGE

@@ -1,4 +0,0 @@
-Description:
-  
-  
-Usage:

data/activerecord_generators/model/model_generator.rb

@@ -1,41 +0,0 @@
-class ModelGenerator < Merb::GeneratorBase
-  attr_reader :model_attributes, :model_class_name, :model_file_name, :migration_args
-  
-  def initialize(args, runtime_args = {})
-    @base =                 File.dirname(__FILE__)
-    @migration_args = args.dup
-    super
-    @model_file_name =      args.shift.snake_case
-    @model_class_name =     @model_file_name.to_const_string
-    @model_attributes =     Hash[*(args.map{|a| a.split(":") }.flatten)]
-    @model_file_name =      "#{@model_class_name.snake_case}"
-    
-    
-  end
-  
-  def manifest
-    record do |m|
-      @m = m
-    
-      @assigns = {  :model_file_name  => model_file_name, 
-                    :model_attributes => model_attributes,
-                    :model_class_name => model_class_name
-                  }
-      copy_dirs
-      copy_files
-      
-      m.dependency "migration", [*self.migration_args]
-      m.dependency "merb_model_test", [model_file_name], @assigns
-    end
-  end
-  
-  protected
-  def banner
-    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
-      Creates an Active Record Model stub..
-
-      USAGE: #{spec.name}"
-    EOS
-  end
-      
-end

data/activerecord_generators/model/templates/app/models/%model_file_name%.rb

@@ -1,2 +0,0 @@
-class <%= model_class_name %> < ActiveRecord::Base
-end

data/activerecord_generators/resource_controller/resource_controller_generator.rb

@@ -1,74 +0,0 @@
-class ResourceControllerGenerator < Merb::GeneratorBase
-  
-  attr_reader :controller_class_name, 
-              :controller_file_name, 
-              :controller_base_path,
-              :controller_modules,
-              :model_class_name,
-              :full_controller_const,
-              :singular_model,
-              :plural_model
-  
-  def initialize(args, runtime_args = {})
-    @base =             File.dirname(__FILE__)
-    
-    super
-    name = args.shift
-    nfp = name.snake_case.gsub("::", "/")
-    nfp = nfp.split("/")
-    @model_class_name = nfp.pop.singularize.to_const_string
-    @model_class_name = runtime_args[:model_class_name] if runtime_args[:model_class_name]
-    @singular_model         = @model_class_name.snake_case
-    @plural_model           = @singular_model.pluralize
-    
-    nfp << @plural_model
-    
-    @controller_file_name = nfp.join("/")
-    
-    # Need to setup the directories
-    unless @controller_file_name == File.basename(@controller_file_name)
-      @controller_base_path   = controller_file_name.split("/")[0..-2].join("/") 
-    end
-    
-    @controller_modules     = @controller_file_name.to_const_string.split("::")[0..-2]
-    @controller_class_name  = @controller_file_name.to_const_string.split("::").last
-
-    @full_controller_const = ((@controller_modules.dup || []) << @controller_class_name).join("::")
-  end
-  
-  def manifest
-    record do |m|
-      @m = m
-      
-      # Create the controller directory
-      m.directory File.join("app/controllers", controller_base_path) if controller_base_path
-      
-      # Create the helpers directory
-      m.directory File.join("app/helpers", controller_base_path) if controller_base_path
-      
-      @assigns =  {
-                    :controller_modules         => controller_modules,
-                    :controller_class_name      => controller_class_name,
-                    :controller_file_name       => controller_file_name,
-                    :controller_base_path       => controller_base_path,
-                    :full_controller_const      => full_controller_const,
-                    :model_class_name           => model_class_name,
-                    :singular_model             => singular_model,
-                    :plural_model               => plural_model
-                  }      
-      copy_dirs
-      copy_files
-      
-      m.dependency "merb_resource_controller_test", [@controller_class_name], @assigns
-    end
-  end
-  
-  protected
-  def banner
-    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
-      Creates a basic Merb resource controller.
-
-      USAGE: #{spec.name} my_resource
-    EOS
-  end
-end

data/activerecord_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb

@@ -1,68 +0,0 @@
-<% counter = 0 -%>
-<% controller_modules.each_with_index do |mod, i| -%>
-<%= "  " * i %>module <%= mod %>
-<% counter = i -%>
-<% end -%>
-<% counter = counter == 0 ? 0 : (counter + 1) -%>
-<%= "  " * counter %>class <%= controller_class_name %> < Application
-<%= "  " * counter %>  # provides :xml, :yaml, :js
-
-<%= "  " * counter %>  def index
-<%= "  " * counter %>    @<%= plural_model %> = <%= model_class_name %>.find(:all)
-<%= "  " * counter %>    display @<%= plural_model %>
-<%= "  " * counter %>  end
-
-<%= "  " * counter %>  def show
-<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.find_by_id(params[:id])
-<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
-<%= "  " * counter %>    display @<%= singular_model %>
-<%= "  " * counter %>  end
-
-<%= "  " * counter %>  def new
-<%= "  " * counter %>    only_provides :html
-<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.new(params[:<%= singular_model %>])
-<%= "  " * counter %>    render
-<%= "  " * counter %>  end
-
-<%= "  " * counter %>  def create
-<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.new(params[:<%= singular_model %>])
-<%= "  " * counter %>    if @<%= singular_model %>.save
-<%= "  " * counter %>      redirect url(:<%= (controller_modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
-<%= "  " * counter %>    else
-<%= "  " * counter %>      render :new
-<%= "  " * counter %>    end
-<%= "  " * counter %>  end
-
-<%= "  " * counter %>  def edit
-<%= "  " * counter %>    only_provides :html
-<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.find_by_id(params[:id])
-<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
-<%= "  " * counter %>    render
-<%= "  " * counter %>  end
-
-<%= "  " * counter %>  def update
-<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.find_by_id(params[:id])
-<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
-<%= "  " * counter %>    if @<%= singular_model %>.update_attributes(params[:<%= singular_model %>])
-<%= "  " * counter %>      redirect url(:<%= (controller_modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
-<%= "  " * counter %>    else
-<%= "  " * counter %>      raise BadRequest
-<%= "  " * counter %>    end
-<%= "  " * counter %>  end
-
-<%= "  " * counter %>  def destroy
-<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.find_by_id(params[:id])
-<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
-<%= "  " * counter %>    if @<%= singular_model %>.destroy
-<%= "  " * counter %>      redirect url(:<%= (controller_modules.collect{|m| m.downcase} << singular_model).join("_") %>s)
-<%= "  " * counter %>    else
-<%= "  " * counter %>      raise BadRequest
-<%= "  " * counter %>    end
-<%= "  " * counter %>  end
-
-<%= "  " * counter %>end
-<% counter = counter == 0 ? 0 : (counter - 1) -%>
-<% controller_modules.reverse.each_with_index do |mod, i| -%>
-<%= "  " * counter %>end # <%= mod %>
-<% counter = counter - 1 -%>
-<% end -%>

data/activerecord_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb

@@ -1,16 +0,0 @@
-<% counter = 1 -%>
-module Merb
-<% controller_modules.each_with_index do |mod, i| -%>
-<%= "  " * i %>module <%= mod %>
-<% counter = i -%>
-<% end -%>
-<% counter = counter == 0 ? 0 : (counter + 1) -%>
-<%= "  " * counter %>module <%= controller_class_name %>Helper
-
-<%= "  " * counter %>end
-<% counter = counter == 0 ? 0 : (counter - 1) -%>
-<% controller_modules.reverse.each_with_index do |mod, i| -%>
-<%= "  " * counter %>end # <%= mod %>
-<% counter = counter - 1 -%>
-<% end -%>
-end

data/activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb

@@ -1,3 +0,0 @@
-<h1><%= full_controller_const %> controller, edit action</h1>
-
-<p>Edit this file in <tt>app/views/<%= controller_file_name %>/edit.html.erb</tt></p>

data/activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb

@@ -1,3 +0,0 @@
-<h1><%= full_controller_const %> controller, index action</h1>
-
-<p>Edit this file in <tt>app/views/<%= controller_file_name %>/index.html.erb</tt></p>

data/activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb

@@ -1,3 +0,0 @@
-<h1><%= full_controller_const %> controller, new action</h1>
-
-<p>Edit this file in <tt>app/views/<%= controller_file_name %>/new.html.erb</tt></p>

data/activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb

@@ -1,3 +0,0 @@
-<h1><%= full_controller_const %> controller, show action</h1>
-
-<p>Edit this file in <tt>app/views/<%= controller_file_name %>/show.html.erb</tt></p>