merb_activerecord/activerecord_generators/migration/templates/schema/migrations/%migration_file_name%.rb merb_activerecord/activerecord_generators/model/templates/app/models/%model_file_name%.rb merb_activerecord/activerecord_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb merb_activerecord/activerecord_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb merb_activerecord/activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb merb_activerecord/activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb merb_activerecord/activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb merb_activerecord/activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb merb_sequel/sequel_generators/database_sessions_migration/USAGE merb_sequel/sequel_generators/database_sessions_migration/database_sessions_migration_generator.rb merb_sequel/sequel_generators/database_sessions_migration/templates/sessions_migration.erb @@ -1,4 +1,4 @@ -Copyright (c) 2007 YOUR NAME +Copyright (c) 2007 Duane Johnson Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the merb_activerecord/LICENSE @@ -1,9 +1,11 @@ -require 'merb' -class DatabaseSessionsMigrationGenerator < RubiGen::Base +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 merb_activerecord/activerecord_generators/database_sessions_migration/database_sessions_migration_generator.rb @@ -1,14 +1,42 @@ -require 'merb/generators/merb_generator_helpers' - -class MigrationGenerator < Merb::GeneratorHelpers::MigrationGeneratorBase +class MigrationGenerator < Merb::GeneratorBase + attr_reader :model_attributes, :model_class_name, :model_file_name, :table_name - def initialize( *args ) - super( *args ) - @migration_template_name = "new_migration.erb" + 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 self.superclass - RubiGen::Base - 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 \ No newline at end of file merb_activerecord/activerecord_generators/migration/migration_generator.rb @@ -1,16 +1,41 @@ -require 'merb/generators/merb_generator_helpers' - -class ModelGenerator < Merb::GeneratorHelpers::ModelGeneratorBase +class ModelGenerator < Merb::GeneratorBase + attr_reader :model_attributes, :model_class_name, :model_file_name, :migration_args - def initialize( *args ) - super( *args ) - @model_template_name = "new_model.erb" - @migration_generator_name = "migration" - @model_test_generator_name = "merb_model_test" + 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 self.superclass - RubiGen::Base - 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 \ No newline at end of file merb_activerecord/activerecord_generators/model/model_generator.rb @@ -1,26 +1,74 @@ -require 'merb/generators/merb_generator_helpers' - -class ResourceControllerGenerator < Merb::GeneratorHelpers::ControllerGeneratorBase +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 - def initialize(*args) - runtime_options = args.last.is_a?(Hash) ? args.pop : {} - name, *actions = args.flatten - runtime_options[:actions] = %w[index show new edit] - runtime_options[:test_stub_generator] = "merb_controller_test" - super( [name], runtime_options ) + @full_controller_const = ((@controller_modules.dup || []) << @controller_class_name).join("::") end - - def self.superclass - RubiGen::Base + + 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 - Creates a Merb controller, views and specs using Active Record Models + <<-EOS.split("\n").map{|x| x.strip}.join("\n") + Creates a basic Merb resource controller. - USAGE: #{$0} #{spec.name} resource_name" - EOS + USAGE: #{spec.name} my_resource + EOS end - end \ No newline at end of file merb_activerecord/activerecord_generators/resource_controller/resource_controller_generator.rb @@ -46,11 +46,9 @@ module Merb # Registering this ORM lets the user choose active_record as a session # in merb.yml's session_store: option. def register_session_type - Merb.after_app_loaded do - Merb.register_session_type("activerecord", - "merb/session/active_record_session", - "Using ActiveRecord database sessions") - end + Merb.register_session_type("activerecord", + "merb/session/active_record_session", + "Using ActiveRecord database sessions") end end end merb_activerecord/lib/merb/orms/active_record/connection.rb @@ -2,18 +2,24 @@ require "active_record" module Merb module SessionMixin - def setup_session - Merb.logger.info("Setting up session") - before = cookies[_session_id_key] - request.session, cookies[_session_id_key] = Merb::ActiveRecordSession.persist(cookies[_session_id_key]) - @_fingerprint = Marshal.dump(request.session.data).hash - @_new_cookie = cookies[_session_id_key] != before - end + def self.included(base) + base.add_hook :before_dispatch do + Merb.logger.info("Setting up session") + before = cookies[_session_id_key] + request.session, cookies[_session_id_key] = Merb::ActiveRecordSession.persist(cookies[_session_id_key]) + @_fingerprint = Marshal.dump(request.session.data).hash + @_new_cookie = cookies[_session_id_key] != before + end - def finalize_session - Merb.logger.info("Finalize session") - request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash - set_cookie(_session_id_key, request.session.session_id, _session_expiry) if (@_new_cookie || request.session.needs_new_cookie) + base.add_hook :after_dispatch do + Merb.logger.info("Finalize session") + request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash + set_cookie(_session_id_key, request.session.session_id, _session_expiry) if (@_new_cookie || request.session.needs_new_cookie) + end + end + + def session_store_type + "activerecord" end end # ActiveRecordMixin merb_activerecord/lib/merb/session/active_record_session.rb @@ -21,6 +21,8 @@ class ModelGenerator < Merb::GeneratorBase } copy_dirs copy_files + + m.dependency "merb_model_test", [model_file_name], @assigns end end merb_datamapper/datamapper_generators/model/model_generator.rb @@ -16,7 +16,13 @@ class ResourceControllerGenerator < Merb::GeneratorBase name = args.shift nfp = name.snake_case.gsub("::", "/") nfp = nfp.split("/") - nfp << (nfp.pop.pluralize) + @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 @@ -26,10 +32,7 @@ class ResourceControllerGenerator < Merb::GeneratorBase @controller_modules = @controller_file_name.to_const_string.split("::")[0..-2] @controller_class_name = @controller_file_name.to_const_string.split("::").last - @model_class_name = runtime_args[:model_class_name] || @controller_class_name.split("::").last.singularize - @singular_model = @model_class_name.snake_case.singularize - @plural_model = @singular_model.pluralize - + @full_controller_const = ((@controller_modules.dup || []) << @controller_class_name).join("::") end merb_datamapper/datamapper_generators/resource_controller/resource_controller_generator.rb @@ -12,8 +12,8 @@ <%= " " * counter %> display @<%= plural_model %> <%= " " * counter %> end -<%= " " * counter %> def show(id) -<%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>[id] +<%= " " * counter %> def show +<%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>.first(params[:id]) <%= " " * counter %> raise NotFound unless @<%= singular_model %> <%= " " * counter %> display @<%= singular_model %> <%= " " * counter %> end @@ -24,15 +24,15 @@ <%= " " * counter %> render <%= " " * counter %> end -<%= " " * counter %> def edit(id) +<%= " " * counter %> def edit <%= " " * counter %> only_provides :html -<%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>[id] +<%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>.first(params[:id]) <%= " " * counter %> raise NotFound unless @<%= singular_model %> <%= " " * counter %> render <%= " " * counter %> end -<%= " " * counter %> def create(singular_model) -<%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>.new(<%= singular_model %>) +<%= " " * counter %> def create +<%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>.new(params[:<%= singular_model %>]) <%= " " * counter %> if @<%= singular_model %>.save <%= " " * counter %> redirect url(:<%= singular_model %>, @<%= singular_model %>) <%= " " * counter %> else @@ -40,18 +40,18 @@ <%= " " * counter %> end <%= " " * counter %> end -<%= " " * counter %> def update(id, singular_model) -<%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>[id] +<%= " " * counter %> def update +<%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>.first(params[:id]) <%= " " * counter %> raise NotFound unless @<%= singular_model %> -<%= " " * counter %> if @<%= singular_model %>.update_attributes(<%= singular_model %>) +<%= " " * counter %> if @<%= singular_model %>.update_attributes(params[:<%= singular_model %>]) <%= " " * counter %> redirect url(:<%= singular_model %>, @<%= singular_model %>) <%= " " * counter %> else <%= " " * counter %> raise BadRequest <%= " " * counter %> end <%= " " * counter %> end -<%= " " * counter %> def destroy(id) -<%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>[id] +<%= " " * counter %> def destroy +<%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>.first(params[:id]) <%= " " * counter %> raise NotFound unless @<%= singular_model %> <%= " " * counter %> if @<%= singular_model %>.destroy! <%= " " * counter %> redirect url(:<%= singular_model.pluralize %>) merb_datamapper/datamapper_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb @@ -1,4 +1,5 @@ -<% counter = 0 -%> +<% counter = 1 -%> +module Merb <% controller_modules.each_with_index do |mod, i| -%> <%= " " * i %>module <%= mod %> <% counter = i -%> @@ -11,4 +12,5 @@ <% controller_modules.reverse.each_with_index do |mod, i| -%> <%= " " * counter %>end # <%= mod %> <% counter = counter - 1 -%> -<% end -%> \ No newline at end of file +<% end -%> +end \ No newline at end of file merb_datamapper/datamapper_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb @@ -0,0 +1,7 @@ +namespace :dm do + desc "Automigrates all models" + task :auto_migrate => :merb_init do + DataMapper::Base.auto_migrate! + end +end + \ No newline at end of file merb_datamapper/lib/merbtasks.rb @@ -18,6 +18,10 @@ module Merb set_cookie(_session_id_key, request.session.values[:session_id], _session_expiry) if (@_new_cookie || request.session.needs_new_cookie) end end + + def session_store_type + "sequel" + end end merb_sequel/lib/merb/session/sequel_session.rb @@ -15,12 +15,12 @@ namespace :sequel do desc "Creates session migration" task :create => :merb_init do - # TODO: this should not use '001' always... - dest = File.join(Merb.root, "schema", "migrations","001_add_sessions_table.rb") - source = File.join(File.dirname(__FILE__), "merb", "session","001_add_sessions_table.rb") - - FileUtils.mkdir_p File.join(Merb.root, "schema", "migrations") - FileUtils.cp_r source, dest unless File.exists?(dest) + migration_exists = Dir[File.join(Merb.root,"schema", "migrations", "*.rb")].detect{ |f| f =~ /database_sessions\.rb/ } + if migration_exists + puts "\nThe Session Migration File already exists\n\n" + else + sh %{merb-gen database_sessions_migration} + end end desc "Clears sessions" merb_sequel/lib/merbtasks.rb @@ -25,6 +25,7 @@ class ModelGenerator < Merb::GeneratorBase copy_files m.dependency "migration", [*self.migration_args] + m.dependency "merb_model_test", [model_file_name], @assigns end end merb_sequel/sequel_generators/model/model_generator.rb @@ -16,7 +16,13 @@ class ResourceControllerGenerator < Merb::GeneratorBase name = args.shift nfp = name.snake_case.gsub("::", "/") nfp = nfp.split("/") - nfp << (nfp.pop.pluralize) + @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 @@ -26,10 +32,7 @@ class ResourceControllerGenerator < Merb::GeneratorBase @controller_modules = @controller_file_name.to_const_string.split("::")[0..-2] @controller_class_name = @controller_file_name.to_const_string.split("::").last - @model_class_name = runtime_args[:model_class_name] || @controller_class_name.split("::").last.singularize - @singular_model = @model_class_name.snake_case.singularize - @plural_model = @singular_model.pluralize - + @full_controller_const = ((@controller_modules.dup || []) << @controller_class_name).join("::") end merb_sequel/sequel_generators/resource_controller/resource_controller_generator.rb @@ -9,12 +9,13 @@ <%= " " * counter %> def index <%= " " * counter %> @<%= plural_model %> = <%= model_class_name %>.all -<%= " " * counter %> render @<%= plural_model %> +<%= " " * counter %> display @<%= plural_model %> <%= " " * counter %> end <%= " " * counter %> def show -<%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>[params[:id]] -<%= " " * counter %> render @<%= singular_model %> +<%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>[params[:id]] +<%= " " * counter %> raise NotFound unless @<%= singular_model %> +<%= " " * counter %> display @<%= singular_model %> <%= " " * counter %> end <%= " " * counter %> def new @@ -35,11 +36,13 @@ <%= " " * counter %> def edit <%= " " * counter %> only_provides :html <%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>[params[:id]] +<%= " " * counter %> raise NotFound unless @<%= singular_model %> <%= " " * counter %> render <%= " " * counter %> end <%= " " * counter %> def update <%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>[params[:id]] +<%= " " * counter %> raise NotFound unless @<%= singular_model %> <%= " " * counter %> if @<%= singular_model %>.update(params[:<%= singular_model %>]) <%= " " * counter %> redirect url(:<%= singular_model %>, @<%= singular_model %>) <%= " " * counter %> else @@ -49,6 +52,7 @@ <%= " " * counter %> def destroy <%= " " * counter %> @<%= singular_model %> = <%= model_class_name %>[params[:id]] +<%= " " * counter %> raise NotFound unless @<%= singular_model %> <%= " " * counter %> if @<%= singular_model %>.destroy <%= " " * counter %> redirect url(:<%= singular_model %>s) <%= " " * counter %> else merb_sequel/sequel_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb @@ -1,4 +1,5 @@ -<% counter = 0 -%> +<% counter = 1 -%> +module Merb <% controller_modules.each_with_index do |mod, i| -%> <%= " " * i %>module <%= mod %> <% counter = i -%> @@ -11,4 +12,5 @@ <% controller_modules.reverse.each_with_index do |mod, i| -%> <%= " " * counter %>end # <%= mod %> <% counter = counter - 1 -%> -<% end -%> \ No newline at end of file +<% end -%> +end \ No newline at end of file merb_sequel/sequel_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb merb_activerecord/activerecord_generators/migration/templates/new_migration.erb merb_activerecord/activerecord_generators/model/templates/new_model.erb merb_activerecord/activerecord_generators/resource_controller/templates/controller.rb merb_activerecord/activerecord_generators/resource_controller/templates/edit.html.erb merb_activerecord/activerecord_generators/resource_controller/templates/helper.rb merb_activerecord/activerecord_generators/resource_controller/templates/index.html.erb merb_activerecord/activerecord_generators/resource_controller/templates/new.html.erb merb_activerecord/activerecord_generators/resource_controller/templates/show.html.erb merb_sequel/lib/merb/session/001_add_sessions_table.rb ed14694b1350483cbeb411adc1a6f7ba742fa104 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-plugins/commit/550cec95cc4209fc531a7c13f60e406406a7324e 550cec95cc4209fc531a7c13f60e406406a7324e 2008-02-06T02:20:03-08:00 2008-02-06T02:20:03-08:00 ORM generators all functional with new merb-gen command. 6be3f6a557d1ab627096cafa9d1cb5f2abc4aff2 Daniel Neighman has.sox@gmail.com