@@ -11,13 +11,11 @@ class AccountsController < ApplicationController end def create - @account = subscription.accounts.create_for(user, params[:account]) - - if @account.valid? - redirect_to(subscription_url(subscription)) - else - render :action => "new" - end + @account = subscription.accounts.create!(params[:account], :author => user) + redirect_to(subscription_url(subscription)) + rescue ActiveRecord::RecordInvalid => error + @account = error.record + render :action => "new" end def destroy app/controllers/accounts_controller.rb @@ -13,7 +13,7 @@ class EventsController < ApplicationController end def create - @event = subscription.events.create_for(user, params[:event]) + @event = subscription.events.create(params[:event], :user => user) end def update app/controllers/events_controller.rb @@ -12,16 +12,9 @@ class Account < ActiveRecord::Base validates_uniqueness_of :name, :scope => :subscription_id, :case_sensitive => false has_many :buckets do - def create_for(author, attributes) - returning build(attributes) do |bucket| - bucket.author = author - bucket.save - end - end - def for_role(role, user) role = role.downcase - find_by_role(role) || create_for(user, :name => role.capitalize, :role => role) + find_by_role(role) || create({:name => role.capitalize, :role => role}, :author => user) end def sorted @@ -100,15 +93,16 @@ class Account < ActiveRecord::Base protected def create_default_buckets - buckets.create_for(author, :name => DEFAULT_BUCKET_NAME, :role => "default") + buckets.create({:name => DEFAULT_BUCKET_NAME, :role => "default"}, :author => author) end def set_starting_balance if starting_balance && !starting_balance[:amount].to_i.zero? - subscription.events.create_for(author, - :occurred_on => starting_balance[:occurred_on], :actor => "Starting balance", - :line_items => [{:account_id => id, :bucket_id => buckets.default.id, - :amount => starting_balance[:amount], :role => "deposit"}]) + subscription.events.create({:occurred_on => starting_balance[:occurred_on], + :actor => "Starting balance", + :line_items => [{:account_id => id, :bucket_id => buckets.default.id, + :amount => starting_balance[:amount], :role => "deposit"}] + }, :user => author) reload # make sure the balance is set correctly end end app/models/account.rb @@ -103,7 +103,7 @@ class Event < ActiveRecord::Base bucket_id = item.delete(:bucket_id) item[:bucket] = if bucket_id =~ /^n:(.*)/ - account.buckets.find_by_name($1) || account.buckets.create_for(user, :name => $1) + account.buckets.find_by_name($1) || account.buckets.create({:name => $1}, :author => user) elsif bucket_id =~ /^r:(.*)/ account.buckets.for_role($1, user) else app/models/event.rb @@ -1,25 +1,10 @@ class Subscription < ActiveRecord::Base belongs_to :owner, :class_name => "User" - has_many :accounts do - def create_for(author, attributes) - returning build(attributes) do |account| - account.author = author - account.save - end - end - end - + has_many :accounts has_many :tags has_many :events do - def create_for(user, attributes) - returning build(attributes) do |event| - event.user = user - event.save - end - end - def recent(n=5) find(:all, :order => "created_at DESC", :limit => n, :include => :account_items) end app/models/subscription.rb @@ -14,3 +14,7 @@ vendor/plugins/project_search: :type: git :repository: git://github.com/37signals/project_search.git :revision: 5d243711fbbd69ac08ba86418316bd15cffa0642 +vendor/plugins/safe_mass_assignment: + :type: git + :repository: git://github.com/jamis/safe_mass_assignment.git + :revision: 7d7e24e551254e0651f5cfb93d876beaed9ed7f7 config/externals.yml @@ -4,14 +4,15 @@ class AccountItemTest < ActiveSupport::TestCase test "create should update balance on account record" do initial_amount = accounts(:john_checking).balance - subscriptions(:john).events.create_for(users(:john), - :occurred_on => 3.days.ago.to_date, :actor => "Something", + subscriptions(:john).events.create({:occurred_on => 3.days.ago.to_date, + :actor => "Something", :line_items => [ { :account_id => accounts(:john_checking).id, :bucket_id => buckets(:john_checking_groceries).id, :amount => -25_75, :role => 'payment_source' }, - ]) + ] + }, :user => users(:john)) assert_equal initial_amount - 25_75, accounts(:john_checking, :reload).balance end test/unit/account_item_test.rb @@ -104,6 +104,6 @@ class AccountTest < ActiveSupport::TestCase options = {:name => "Visa", :role => "credit-card"}.merge(options) - subscription.accounts.create_for(users(:john), options) + subscription.accounts.create(options, :author => users(:john)) end end test/unit/account_test.rb @@ -10,7 +10,7 @@ class EventTest < ActiveSupport::TestCase @event_base[:line_items][0][:account_id] = 12345 assert_no_difference "Event.count" do assert_raise(ActiveRecord::RecordNotFound) do - subscriptions(:john).events.create_for(users(:john), @event_base) + subscriptions(:john).events.create(@event_base, :user => users(:john)) end end end @@ -19,7 +19,7 @@ class EventTest < ActiveSupport::TestCase @event_base[:line_items][0][:account_id] = accounts(:tim_checking).id assert_no_difference "Event.count" do assert_raise(ActiveRecord::RecordNotFound) do - subscriptions(:john).events.create_for(users(:john), @event_base) + subscriptions(:john).events.create(@event_base, :user => users(:john)) end end end @@ -29,7 +29,7 @@ class EventTest < ActiveSupport::TestCase @event_base[:line_items][0][:bucket_id] = 12345 assert_no_difference "Event.count" do assert_raise(ActiveRecord::RecordNotFound) do - subscriptions(:john).events.create_for(users(:john), @event_base) + subscriptions(:john).events.create(@event_base, :user => users(:john)) end end end @@ -38,13 +38,13 @@ class EventTest < ActiveSupport::TestCase @event_base[:line_items][0][:bucket_id] = buckets(:tim_checking_general).id assert_no_difference "Event.count" do assert_raise(ActiveRecord::RecordNotFound) do - subscriptions(:john).events.create_for(users(:john), @event_base) + subscriptions(:john).events.create(@event_base, :user => users(:john)) end end end test "create with existing buckets should associate line items with those buckets" do - event = subscriptions(:john).events.create_for(users(:john), @event_base) + event = subscriptions(:john).events.create(@event_base, :user => users(:john)) assert_equal [-25_75, -15_25], event.line_items.map(&:amount) assert_equal [buckets(:john_checking_groceries), buckets(:john_checking_household)], event.line_items.map(&:bucket) assert buckets(:john_checking_groceries, :reload).updated_at > 1.second.ago.utc @@ -55,7 +55,7 @@ class EventTest < ActiveSupport::TestCase @event_base[:line_items][0][:bucket_id] = "n:Dining" @event_base[:line_items][1][:bucket_id] = "n:Gambling" assert_difference "accounts(:john_checking).buckets.count" do - event = subscriptions(:john).events.create_for(users(:john), @event_base) + event = subscriptions(:john).events.create(@event_base, :user => users(:john)) assert_equal [-25_75, -15_25], event.line_items.map(&:amount) gambling = accounts(:john_checking).buckets.detect { |b| b.name == "Gambling" } assert gambling @@ -68,7 +68,7 @@ class EventTest < ActiveSupport::TestCase @event_base[:line_items][0][:bucket_id] = "r:default" @event_base[:line_items][1][:bucket_id] = "r:custom" assert_difference "accounts(:john_checking).buckets.count" do - event = subscriptions(:john).events.create_for(users(:john), @event_base) + event = subscriptions(:john).events.create(@event_base, :user => users(:john)) assert_equal [-25_75, -15_25], event.line_items.map(&:amount) custom = accounts(:john_checking).buckets.for_role("custom", users(:john)) assert custom @@ -93,23 +93,25 @@ class EventTest < ActiveSupport::TestCase :role => 'aside' } ] - event = subscriptions(:john).events.create_for(users(:john), @event_base) + event = subscriptions(:john).events.create(@event_base, :user => users(:john)) assert_equal [["Checking", 0], ["Mastercard", -25_00]], event.account_items.map { |i| [i.account.name, i.amount] }.sort end test "create with tagged_items should generate tagged_items for event" do - event = subscriptions(:john).events.create_for(users(:john), @event_base.merge( - :tagged_items => [ { :tag_id => tags(:john_lunch).id, :amount => 500 } ])) + event = subscriptions(:john).events.create(@event_base.merge( + :tagged_items => [ { :tag_id => tags(:john_lunch).id, :amount => 500 } ]), + :user => users(:john)) assert_equal 1, event.tagged_items.length assert_equal [500], event.tagged_items.map(&:amount) assert_equal [tags(:john_lunch)], event.tagged_items.map(&:tag) end test "create with named tagged_items should find or create tagged_items" do - event = subscriptions(:john).events.create_for(users(:john), @event_base.merge( - :tagged_items => [ { :tag_id => "n:milk", :amount => 500 }, - { :tag_id => "n:fruit", :amount => 750 } ])) + event = subscriptions(:john).events.create(@event_base.merge( + :tagged_items => [ { :tag_id => "n:milk", :amount => 500 }, + { :tag_id => "n:fruit", :amount => 750 } ]), + :user => users(:john)) assert_equal 2, event.tagged_items.length assert_equal [500, 750], event.tagged_items.map(&:amount) milk = subscriptions(:john).tags.detect { |t| t.name == "milk" } test/unit/event_test.rb @@ -4,14 +4,15 @@ class LineItemTest < ActiveSupport::TestCase test "create should update balance on bucket record" do initial_amount = buckets(:john_checking_groceries).balance - subscriptions(:john).events.create_for(users(:john), - :occurred_on => 3.days.ago.to_date, :actor => "Something", + subscriptions(:john).events.create({:occurred_on => 3.days.ago.to_date, + :actor => "Something", :line_items => [ { :account_id => accounts(:john_checking).id, :bucket_id => buckets(:john_checking_groceries).id, :amount => -25_75, :role => 'payment_source' }, - ]) + ]}, + :user => users(:john)) assert_equal initial_amount - 25_75, buckets(:john_checking_groceries, :reload).balance end test/unit/line_item_test.rb @@ -1,3 +1,4 @@ calendar_date_select haml project_search +safe_mass_assignment vendor/plugins/.gitignore 06e40255dcc4282f843d3410336a7e292286a353 Jamis Buck jamis@37signals.com http://github.com/jamis/bucketwise/commit/18e2419f05a498b397c535f3e2e9be5f55ecad44 18e2419f05a498b397c535f3e2e9be5f55ecad44 2009-04-12T15:36:09-07:00 2009-04-12T15:36:09-07:00 use safe_mass_assignment plugin a004d462dc2fd7a520cddc722c5fa6b579cb9fe1 Jamis Buck jamis@37signals.com