README.rdoc attribute_fu.gemspec test/associated_form_helper_test.rb test/comment_test.rb test/db/.gitignore test/db/database.yml test/log/.gitignore test/models/comment.rb test/models/photo.rb test/photo_test.rb test/test_helper.rb @@ -1,4 +1,5 @@ require 'rake' +require "load_multi_rails_rake_tasks" require 'rake/testtask' require 'rake/rdoctask' Rakefile @@ -54,7 +54,7 @@ module AttributeFu css_selector = options.delete(:selector) || ".#{@object.class.name.split("::").last.underscore}" function = options.delete(:function) || "" - function << "$(this).up("#{css_selector}").remove()" + function << "$(this).up('#{css_selector}').remove()" @template.link_to_function(name, function, *args.push(options)) end @@ -89,7 +89,7 @@ module AttributeFu @template.link_to_function(name, opts) do |page| page << "if (typeof #{variable} == 'undefined') #{variable} = 0;" - page << "new Insertion.Bottom(#{container}, new Template("+form_builder.render_associated_form(object, :fields_for => { :javascript => true }, :partial => partial).to_json+").evaluate({'number': --#{variable}}))" + page << "new Insertion.Bottom(#{container}, new Template("+form_builder.render_associated_form(object, :fields_for => { :javascript => true }, :partial => partial).to_json+").evaluate({'number': --#{variable}}).gsub(/__number_/, #{variable}))" end end lib/attribute_fu/associated_form_helper.rb @@ -62,12 +62,14 @@ module AttributeFu def save_managed_associations #:nodoc: if managed_association_attributes != nil managed_association_attributes.keys.each do |association_id| - association = send(association_id) - association.each(&:save) + if send(association_id).loaded? # don't save what we haven't even loaded + association = send(association_id) + association.each(&:save) - unless (objects_to_remove = instance_variable_get removal_variable_name(association_id)).nil? - objects_to_remove.each { |remove_id| association.delete association.detect { |obj| obj.id.to_s == remove_id.to_s } } - instance_variable_set removal_variable_name(association_id), nil + unless (objects_to_remove = instance_variable_get removal_variable_name(association_id)).nil? + objects_to_remove.each { |remove_id| association.delete association.detect { |obj| obj.id.to_s == remove_id.to_s } } + instance_variable_set removal_variable_name(association_id), nil + end end end end @@ -114,10 +116,20 @@ module AttributeFu discard_if = discard_if.to_proc if discard_if.is_a?(Symbol) managed_association_attributes[association_id][:discard_if] = discard_if end + collection_with_attributes_writer(association_id) end has_many_without_association_option(association_id, options, &extension) end + + private + + def collection_with_attributes_writer(association_name) + define_method("#{association_name.to_s.singularize}_attributes=") do |attributes| + has_many_attributes association_name, attributes + end + end + end end # Associations lib/attribute_fu/associations.rb @@ -1,29 +1,16 @@ -# This file is auto-generated from the current state of the database. Instead of editing this file, -# please use the migrations feature of ActiveRecord to incrementally modify your database, and -# then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your database schema. If you need -# to create the application database on another system, you should be using db:schema:load, not running -# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended to check this file into your version control system. - ActiveRecord::Schema.define(:version => 2) do - create_table "comments", :force => true do |t| - t.integer "photo_id" - t.string "author" - t.text "body" - t.datetime "created_at" - t.datetime "updated_at" + create_table :comments, :force => true do |t| + t.integer :photo_id + t.string :author + t.text :body + t.timestamps end - create_table "photos", :force => true do |t| - t.string "title" - t.text "description" - t.datetime "created_at" - t.datetime "updated_at" + create_table :photos, :force => true do |t| + t.string :title + t.text :description + t.timestamps end end test/db/schema.rb README test/Rakefile test/app/controllers/application.rb test/app/helpers/application_helper.rb test/app/models/comment.rb test/app/models/photo.rb test/config/boot.rb test/config/database.yml test/config/environment.rb test/config/environments/development.rb test/config/environments/test.rb test/config/routes.rb test/db/migrate/001_create_photos.rb test/db/migrate/002_create_comments.rb test/script/console test/script/destroy test/script/generate test/script/server test/test/test_helper.rb test/test/unit/associated_form_helper_test.rb test/test/unit/comment_test.rb test/test/unit/photo_test.rb test/vendor/plugins/shoulda/init.rb test/vendor/plugins/shoulda/lib/shoulda.rb test/vendor/plugins/shoulda/lib/shoulda/active_record_helpers.rb test/vendor/plugins/shoulda/lib/shoulda/context.rb test/vendor/plugins/shoulda/lib/shoulda/general.rb test/vendor/plugins/shoulda/lib/shoulda/private_helpers.rb c83f28d6489ef3f24017c4dee113db5f9c702407 2184928876b6a99cf2aeab6f1f20caafef7975da James Golick james@giraffesoft.ca http://github.com/giraffesoft/attribute_fu/commit/adb3a4719c7fdf511255739adff4e3d86a53526b adb3a4719c7fdf511255739adff4e3d86a53526b

2008-11-25T06:12:29-08:00

Merge branch 'master' into jquery Conflicts: lib/attribute_fu/associated_form_helper.rb test/associated_form_helper_test.rb a88c518f8d15ec8715b3dddf1a56a25ad6f41d33 James Golick james@giraffesoft.ca