mack-orm/lib/mack-orm/genosaurus_helpers.rb mack-orm/lib/mack-orm/model_column.rb mack-orm/lib/mack-orm/orm_helpers.rb mack-orm/spec/fake_application/Rakefile mack-orm/spec/fake_application/app/controllers/default_controller.rb mack-orm/spec/fake_application/app/controllers/people_and_users_controller.rb mack-orm/spec/fake_application/app/controllers/users_controller.rb mack-orm/spec/fake_application/app/models/person.rb mack-orm/spec/fake_application/app/models/user.rb mack-orm/spec/fake_application/app/views/default/index.html.erb mack-orm/spec/fake_application/app/views/layouts/application.html.erb mack-orm/spec/fake_application/app/views/people_and_users/create.html.erb mack-orm/spec/fake_application/app/views/users/_user_errors.html.erb mack-orm/spec/fake_application/app/views/users/create.html.erb mack-orm/spec/fake_application/app/views/users/edit.html.erb mack-orm/spec/fake_application/app/views/users/model_password_field_test.html.erb mack-orm/spec/fake_application/app/views/users/model_text_field_test.html.erb mack-orm/spec/fake_application/app/views/users/model_textarea_test.html.erb mack-orm/spec/fake_application/config/app_config/default.yml mack-orm/spec/fake_application/config/app_config/development.yml mack-orm/spec/fake_application/config/app_config/production.yml mack-orm/spec/fake_application/config/app_config/test.yml mack-orm/spec/fake_application/config/database.yml mack-orm/spec/fake_application/config/initializers/gems.rb mack-orm/spec/fake_application/config/routes.rb mack-orm/spec/fake_application/public/favicon.ico mack-orm/spec/fake_application/public/stylesheets/scaffold.css mack-orm/spec/fake_application/test/test_helper.rb mack-orm/spec/lib/orm_helpers_spec.rb @@ -11,8 +11,6 @@ fl = File.join(File.dirname(__FILE__), "mack-active_record") require File.join(fl, "database") require File.join(fl, "database_migrations") require File.join(fl, "helpers", "orm_helpers") -require File.join(fl, "model_column") -require File.join(fl, "genosaurus_helpers") # [:migration, :model, :scaffold].each do |gen| # require File.join(fl, "#{gen}_generator", "#{gen}_generator") mack-active_record/lib/mack-active_record.rb @@ -2,7 +2,7 @@ require 'pathname' require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper' describe MigrationGenerator do - include Mack::Genosaurus::ActiveRecord::Helpers + include Mack::Genosaurus::Orm::Helpers before(:each) do @content_path = File.join(File.dirname(__FILE__), "contents") mack-active_record/spec/lib/migration_generator_spec.rb @@ -2,7 +2,7 @@ require 'pathname' require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper' describe ScaffoldGenerator do - include Mack::Genosaurus::ActiveRecord::Helpers + include Mack::Genosaurus::Orm::Helpers before(:each) do @view_path = File.join(Mack.root, "app", "views", "zoos") mack-active_record/spec/lib/scaffold_generator_spec.rb @@ -18,9 +18,6 @@ require File.join(fl, "resource") require File.join(fl, "runner") require File.join(fl, "test_extensions") -require File.join(fl, "model_column") -require File.join(fl, "genosaurus_helpers") - [:helpers, :migration_generator, :model_generator, :scaffold_generator, :dm_patches].each do |folder| Dir.glob(File.join(fl, folder.to_s, "**/*.rb")).each {|f| require f} mack-data_mapper/lib/mack-data_mapper.rb @@ -49,28 +49,6 @@ module Mack end end - # Generates a text input tag for a given model and field - # - # Example: - # model_text_field(@user, :username) # => <input id="user_username" name="user[username]" type="text" value="<@user.username's value>" /> - def model_text_field(model, property, options = {}) - m_name = model.class.to_s.underscore - non_content_tag(:input, {:type => :text, :name => "#{m_name}[#{property}]", :id => "#{m_name}_#{property}", :value => model.send(property)}.merge(options)) - end - - # Generates a password input tag for a given model and field - # - # Example: - # model_password_field(@user, :password) # => <input id="user_username" name="user[username]" type="password" value="<@user.username's value>" /> - def model_password_field(model, property, options = {}) - model_text_field(model, property, {:type => :password}.merge(options)) - end - - def model_textarea(model, property, options = {}) - m_name = model.class.to_s.underscore - content_tag(:textarea, {:name => "#{m_name}[#{property}]", :id => "#{m_name}_#{property}", :cols => 60, :rows => 20}.merge(options), model.send(property)) - end - end # OrmHelpers end # ViewHelpers end # Mack \ No newline at end of file mack-data_mapper/lib/mack-data_mapper/helpers/orm_helpers.rb @@ -42,7 +42,7 @@ class MigrationGenerator < Genosaurus end def migration_columns # :nodoc: - [Mack::Genosaurus::DataMapper::ModelColumn.new(param(:name), "id:serial"), columns].flatten + [Mack::Genosaurus::Orm::ModelColumn.new(param(:name), "id:serial"), columns].flatten end def get_column_type(column) # :nodoc: mack-data_mapper/lib/mack-data_mapper/migration_generator/migration_generator.rb @@ -53,7 +53,7 @@ class ModelGenerator < Genosaurus end def migration_columns # :nodoc: - [Mack::Genosaurus::DataMapper::ModelColumn.new(param(:name), "id:serial"), columns].flatten + [Mack::Genosaurus::Orm::ModelColumn.new(param(:name), "id:serial"), columns].flatten end end \ No newline at end of file mack-data_mapper/lib/mack-data_mapper/model_generator/model_generator.rb @@ -12,16 +12,4 @@ class UsersController render(:action, :edit) end - def model_text_field_test - @user = User.new(:username => "markbates") - end - - def model_password_field_test - @user = User.new(:username => "markbates") - end - - def model_textarea_test - @user = User.new(:username => "markbates") - end - end \ No newline at end of file mack-data_mapper/spec/fake_application/app/controllers/users_controller.rb @@ -1,10 +1,5 @@ Mack::Routes.build do |r| - r.with_options(:controller => :users) do |c| - c.model_text_field_test "/users/model_text_field_test", :action => :model_text_field_test - c.model_password_field_test "/users/model_password_field_test", :action => :model_password_field_test - c.model_textarea_test "/users/model_textarea_test", :action => :model_textarea_test - end r.resource :users r.resource :people_and_users mack-data_mapper/spec/fake_application/config/routes.rb @@ -2,7 +2,8 @@ require 'pathname' require Pathname(__FILE__).dirname.expand_path.parent.parent + 'spec_helper' describe Mack::ViewHelpers::DataMapperHelpers do - include Mack::ViewHelpers::DataMapperHelpers + include Mack::ViewHelpers + describe "error_messages_for" do before(:all) do @@ -36,31 +37,4 @@ describe Mack::ViewHelpers::DataMapperHelpers do end - describe "model_text_field" do - - it "should generate a model_text_field tag for the model's property" do - get model_text_field_test_url - response.body.should == %{<input id="user_username" name="user[username]" type="text" value="markbates" />} - end - - end - - describe "model_password_field" do - - it "should generate a model_password_field tag for the model's property" do - get model_password_field_test_url - response.body.should == %{<input id="user_username" name="user[username]" type="password" value="markbates" />} - end - - end - - describe "model_textarea" do - - it "should generate a textarea tag" do - get model_textarea_test_url - response.body.should == %{<textarea cols="60" id="user_username" name="user[username]" rows="20">markbates</textarea>} - end - - end - end \ No newline at end of file mack-data_mapper/spec/lib/helpers/orm_helpers_spec.rb @@ -1,2 +1,9 @@ -require File.join(File.dirname(__FILE__), "mack-orm", "database") -require File.join(File.dirname(__FILE__), "mack-orm", "database_migrations") \ No newline at end of file +require 'rubygems' +require 'genosaurus' + +base = File.join(File.dirname(__FILE__), "mack-orm") +require File.join(base, "database") +require File.join(base, "database_migrations") +require File.join(base, "genosaurus_helpers") +require File.join(base, "model_column") +require File.join(base, "orm_helpers") \ No newline at end of file mack-orm/lib/mack-orm.rb @@ -2,4 +2,15 @@ require 'rubygems' gem 'rspec' require 'spec' require 'rake' -require 'fileutils' \ No newline at end of file +require 'fileutils' + + +ENV["MACK_ROOT"] = File.join(File.dirname(__FILE__), "fake_application") +ENV["MACK_ENV"] = "test" + +$: << File.expand_path(File.dirname(__FILE__) + "/../lib") +$: << File.expand_path(File.dirname(__FILE__) + "/../../mack-data_mapper/lib") + +require 'mack' + +require File.join(File.dirname(__FILE__), "..", "lib", "mack-orm") mack-orm/spec/spec_helper.rb mack-active_record/lib/mack-active_record/genosaurus_helpers.rb mack-active_record/lib/mack-active_record/model_column.rb mack-data_mapper/lib/mack-data_mapper/genosaurus_helpers.rb mack-data_mapper/lib/mack-data_mapper/model_column.rb mack-data_mapper/spec/fake_application/app/views/users/model_password_field_test.html.erb mack-data_mapper/spec/fake_application/app/views/users/model_text_field_test.html.erb mack-data_mapper/spec/fake_application/app/views/users/model_textarea_test.html.erb 920e0c8941f3518ef32f8d4b6d823a468fd5a677 Mark Bates mark@markbates.com http://github.com/markbates/mack-more/commit/ed02d23180e00a926bebb8490228fcdf8808cf4a ed02d23180e00a926bebb8490228fcdf8808cf4a 2008-08-12T13:39:56-07:00 2008-08-12T13:39:56-07:00 more refactoring of the orm stuff. [#87] 1bb5900fecec63e89fd9bdb0f0cfac3d4f456ea9 Mark Bates mark@markbates.com