@@ -9,10 +9,10 @@ if Mack.env == "test" # Wrap it so we don't accidentally alias the run method n times and run out of db connections! unless Mack::Testing.const_defined?("AR_TEST_EXTENSIONS") - AR_TEST_EXTENSIONS = 1 module Mack module Testing + AR_TEST_EXTENSIONS = 1 # module Helpers # alias_method :mack_rake_task, :rake_task # mack-active_record/lib/mack-active_record/test_extensions.rb @@ -1,7 +1,5 @@ whiny_config_missing: false mack::session_id: _fake_application_session_id - -orm: active_record mack::testing_framework: test_case disable_transactional_tests: true \ No newline at end of file mack-active_record/spec/fake_application/config/app_config/default.yml @@ -10,3 +10,5 @@ require_gems do |gem| # gem.add :termios # gem.add :rubyzip, :source => "http://gems.rubyforge.org" end + +require 'mack-active_record' mack-active_record/spec/fake_application/config/initializers/gems.rb @@ -5,6 +5,7 @@ migration 1, :create_zoos do column :id, Serial column :name, String column :description, Text + column :password, String column :created_at, DateTime column :updated_at, DateTime end mack-data_mapper/spec/fixtures/create_zoos.rb.fixture @@ -4,6 +4,7 @@ class Zoo property :id, Serial property :name, String property :description, Text + property :password, String property :created_at, DateTime property :updated_at, DateTime end mack-data_mapper/spec/fixtures/zoo.rb.fixture @@ -4,15 +4,16 @@ <% form(zoos_update_url(:id => @zoo), :class => "edit_zoo", :id => "edit_zoo", :method => :put) do %> - Name - <%= model_text_field(@zoo, :name) %> + <%= :zoo.text_field :name, :label => true %> - Description - <%= model_textarea(@zoo, :description) %> + <%= :zoo.text_area :description, :label => true %> - <%= submit_tag("Update") %> + <%= :zoo.password_field :password, :label => true %> + + + <%= submit_button("Update") %> <% end %> mack-data_mapper/spec/fixtures/zoo_edit.html.erb.fixture @@ -4,8 +4,8 @@ <tr> <th>Name</th> <th>Description</th> - <th>CreatedAt</th> - <th>UpdatedAt</th> + <th>Created at</th> + <th>Updated at</th> </tr> <% for zoo in @zoos %> mack-data_mapper/spec/fixtures/zoo_index.html.erb.fixture @@ -4,15 +4,16 @@ <% form(zoos_create_url, :class => "new_zoo", :id => "new_zoo") do %> - Name - <%= model_text_field(@zoo, :name) %> + <%= :zoo.text_field :name, :label => true %> - Description - <%= model_textarea(@zoo, :description) %> + <%= :zoo.text_area :description, :label => true %> - <%= submit_tag("Create") %> + <%= :zoo.password_field :password, :label => true %> + + + <%= submit_button("Create") %> <% end %> mack-data_mapper/spec/fixtures/zoo_new.html.erb.fixture @@ -2,19 +2,19 @@ <h1>Zoo</h1> - Name + <label for="zoo_name">Name</label> <%= @zoo.name %> - Description + <label for="zoo_description">Description</label> <%= @zoo.description %> - CreatedAt + <label for="zoo_created_at">Created at</label> <%= @zoo.created_at %> - UpdatedAt + <label for="zoo_updated_at">Updated at</label> <%= @zoo.updated_at %> mack-data_mapper/spec/fixtures/zoo_show.html.erb.fixture @@ -25,7 +25,7 @@ describe MigrationGenerator do end it "should create a 'full' migration file if columns are specified" do - MigrationGenerator.run("NAME" => "create_zoos", "cols" => "name:string,description:text,created_at:date_time,updated_at:date_time") + MigrationGenerator.run("NAME" => "create_zoos", "cols" => "name:string,description:text,password:string,created_at:date_time,updated_at:date_time") File.read(@migration_file).should == fixture("create_zoos.rb") end mack-data_mapper/spec/lib/migration_generator_spec.rb @@ -30,7 +30,7 @@ describe ModelGenerator do it "should create a full file for the model" do File.should_not be_exists(@model_file) - ModelGenerator.run("NAME" => "zoo", "cols" => "name:string,description:text,created_at:date_time,updated_at:date_time") + ModelGenerator.run("NAME" => "zoo", "cols" => "name:string,description:text,password:string,created_at:date_time,updated_at:date_time") File.should be_exists(@model_file) File.read(@model_file).should == fixture("zoo.rb") end @@ -38,7 +38,7 @@ describe ModelGenerator do it "should create a stub test/unit test for the model if test/unit is testing framework" do temp_app_config("mack::testing_framework" => "test_case") do File.should_not be_exist(Mack::Paths.model_tests("zoo_test.rb")) - ModelGenerator.run("NAME" => "zoo", "cols" => "name:string,description:text,created_at:date_time,updated_at:date_time") + ModelGenerator.run("NAME" => "zoo", "cols" => "name:string,description:text,password:string,created_at:date_time,updated_at:date_time") File.should be_exist(Mack::Paths.model_tests("zoo_test.rb")) File.read(Mack::Paths.model_tests("zoo_test.rb")).should == fixture("zoo_test.rb") end @@ -47,7 +47,7 @@ describe ModelGenerator do it "should create a stub rspec test for the model if rspec is testing framework" do temp_app_config("mack::testing_framework" => "rspec") do File.should_not be_exist(Mack::Paths.model_tests("zoo_spec.rb")) - ModelGenerator.run("NAME" => "zoo", "cols" => "name:string,description:text,created_at:date_time,updated_at:date_time") + ModelGenerator.run("NAME" => "zoo", "cols" => "name:string,description:text,password:string,created_at:date_time,updated_at:date_time") File.should be_exist(Mack::Paths.model_tests("zoo_spec.rb")) File.read(Mack::Paths.model_tests("zoo_spec.rb")).should == fixture("zoo_spec.rb") end @@ -56,7 +56,7 @@ describe ModelGenerator do it "should create a migration file" do mig_file = Mack::Paths.migrations("001_create_zoos.rb") File.should_not be_exists(mig_file) - ModelGenerator.run("NAME" => "zoo", "cols" => "name:string,description:text,created_at:date_time,updated_at:date_time") + ModelGenerator.run("NAME" => "zoo", "cols" => "name:string,description:text,password:string,created_at:date_time,updated_at:date_time") File.should be_exists(mig_file) end mack-data_mapper/spec/lib/model_generator_spec.rb @@ -105,7 +105,7 @@ describe ScaffoldGenerator do end def zoo_options - {"name" => "zoo", "cols" => "name:string,description:text,created_at:date_time,updated_at:date_time"} + {"name" => "zoo", "cols" => "name:string,description:text,password:string,created_at:date_time,updated_at:date_time"} end end \ No newline at end of file mack-data_mapper/spec/lib/scaffold_generator_spec.rb @@ -23,15 +23,20 @@ module Mack # # Examples: # Mack::Generator::ColumnObject.new("user", "username:string").form_field - # => "<%= model_text_field(@user, :username) %>" + # => "<%= :user.text_field :username, :label => true %>" # Mack::Generator::ColumnObject.new("Post", "body:text").form_field - # => "<%= model_textarea(@user, :username) %>" + # => "<%= :post.text_area :body, :label => true %>" def form_field case self.column_type when "text" - %{<%= model_textarea(@#{self.model_name}, :#{self.column_name}) %>} + %{<%= :#{self.model_name}.text_area :#{self.column_name}, :label => true %>} else - %{<%= model_text_field(@#{self.model_name}, :#{self.column_name}) %>} + case self.column_name.downcase + when /password/ + %{<%= :#{self.model_name}.password_field :#{self.column_name}, :label => true %>} + else + %{<%= :#{self.model_name}.text_field :#{self.column_name}, :label => true %>} + end end end mack-orm/lib/mack-orm/model_column.rb @@ -2,26 +2,25 @@ module Mack module ViewHelpers # :nodoc: module OrmHelpers - # 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 = {}) + # DEPRECATED: Use Mack::ViewHelpers::FormHelpers text_field instead. + def model_text_field(model, property, options = {}) # :nodoc: + deprecate_method(:model_text_field, :text_field, '0.7.0') 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)) + text_field(model.class.to_s.underscore, property, 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)) + # DEPRECATED: Use Mack::ViewHelpers::FormHelpers password_field instead. + def model_password_field(model, property, options = {}) # :nodoc: + deprecate_method(:model_password_field, :password_field, '0.7.0') + m_name = model.class.to_s.underscore + password_field(model.class.to_s.underscore, property, options) end - def model_textarea(model, property, options = {}) + # DEPRECATED: Use Mack::ViewHelpers::FormHelpers text_area instead. + def model_textarea(model, property, options = {}) # :nodoc: + deprecate_method(:model_textarea, :text_area, '0.7.0') 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)) + text_area(model.class.to_s.underscore, property, options) end end # OrmHelpers mack-orm/lib/mack-orm/orm_helpers.rb @@ -19,6 +19,11 @@ class ScaffoldGenerator < Genosaurus update_routes_file end + def showable_columns + cols = columns.reject {|c| c.column_name.downcase.match(/password/)} + cols + end + def update_routes_file # :nodoc: # update routes.rb routes = File.join(Mack.root, "config", "routes.rb") mack-orm/lib/mack-orm/scaffold_generator/scaffold_generator.rb @@ -6,13 +6,12 @@ <% for column in columns -%> <% unless column.column_name == "created_at" || column.column_name == "updated_at" -%> - <%= column.column_name.singular.camelcase %> <%= column.form_field %> <% end -%> <% end -%> - <%%= submit_tag("Update") %> + <%%= submit_button("Update") %> <%% end %> mack-orm/lib/mack-orm/scaffold_generator/templates/app/views/edit.html.erb.template @@ -3,10 +3,10 @@ <table> <tr> <% -unless columns.empty? - columns.each do |col| +unless showable_columns.empty? + showable_columns.each do |col| -%> - <th><%= col.column_name.camelcase %></th> + <th><%= col.column_name.humanize %></th> <% end else @@ -20,8 +20,8 @@ end <%% for <%= @name_singular %> in @<%= @name_plural %> %> <tr> <% -unless columns.empty? - columns.each do |col| -%> +unless showable_columns.empty? + showable_columns.each do |col| -%> <td><%%= <%= @name_singular %>.<%= col.column_name %> %></td> <% end mack-orm/lib/mack-orm/scaffold_generator/templates/app/views/index.html.erb.template @@ -6,13 +6,12 @@ <% for column in columns -%> <% unless column.column_name == "created_at" || column.column_name == "updated_at" -%> - <%= column.column_name.singular.camelcase %> <%= column.form_field %> <% end -%> <% end -%> - <%%= submit_tag("Create") %> + <%%= submit_button("Create") %> <%% end %> mack-orm/lib/mack-orm/scaffold_generator/templates/app/views/new.html.erb.template @@ -1,9 +1,9 @@ <h1><%= @name_singular_camel %></h1> -<% for column in columns -%> +<% for column in showable_columns -%> - <%= column.column_name.singular.camelcase %> + <label for="<%= @name_singular %>_<%= column.column_name %>"><%= column.column_name.singular.humanize %></label> <%%= @<%= @name_singular %>.<%= column.column_name %> %> <% end -%> mack-orm/lib/mack-orm/scaffold_generator/templates/app/views/show.html.erb.template f6f5f93fef03bbb8f049d18327563774597c1ed2 53617cb0e02a759436ea2b032269fa77486080f7 dsutedja dsutedja@helium.com http://github.com/markbates/mack-more/commit/ba6ec235f36909f2a120ca10fdc8e093dcb1e62a ba6ec235f36909f2a120ca10fdc8e093dcb1e62a

2008-08-15T14:22:21-07:00

Merge branch 'master' of git@github.com:markbates/mack-more 1a0141d7e28187b234a47111da539a818de4ff25 dsutedja dsutedja@helium.com