acts_as_account 1.1.5 → 1.1.6

data/Gemfile

@@ -0,0 +1,20 @@
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rspec", "~> 2.3.0"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.5.2"
+  gem "cucumber", "~> 0.9.4"
+  gem 'mysql', '>= 2.7.0'
+end
+
+group :default do
+  gem "activerecord", "~> 2.3.5"
+  gem "actionpack", "~> 2.3.5"
+  gem "database_cleaner"
+end

data/Gemfile.lock

@@ -0,0 +1,52 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionpack (2.3.11)
+      activesupport (= 2.3.11)
+      rack (~> 1.1.0)
+    activerecord (2.3.11)
+      activesupport (= 2.3.11)
+    activesupport (2.3.11)
+    builder (2.1.2)
+    cucumber (0.9.4)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.2.9)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    database_cleaner (0.6.6)
+    diff-lcs (1.1.2)
+    gherkin (2.2.9)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    git (1.2.5)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    json (1.4.6)
+    mysql (2.8.1)
+    rack (1.1.2)
+    rake (0.8.7)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+    term-ansicolor (1.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 2.3.5)
+  activerecord (~> 2.3.5)
+  bundler (~> 1.0.0)
+  cucumber (~> 0.9.4)
+  database_cleaner
+  jeweler (~> 1.5.2)
+  mysql (>= 2.7.0)
+  rspec (~> 2.3.0)

data/Rakefile

@@ -1,4 +1,13 @@
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+  Bundler.require(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
 begin
@@ -30,5 +39,5 @@ namespace :features do
     conn.execute('CREATE DATABASE acts_as_account')
     conn.execute('USE acts_as_account')
     load(File.dirname(__FILE__) + '/db/schema.rb')
-  end  
+  end
 end

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

data/features/account/account_creation.feature

@@ -4,8 +4,13 @@ Feature: Creating an Account
 
   Scenario: Every Holder should have a default Account
     Then User A has an Account named default
-    
-  Scenario: Creating a second Accounts with the same name for a Holder returns original account 
+
+  Scenario: Creating a second Accounts with the same name for a Holder returns original account
     Given User A has an Account named default
     And I create an Account named default for User A
-    Then I get the original account
+    Then I get the original account
+
+  Scenario: Race condition while creating account
+    Given I have the same user in memory
+    And I disable the account existence check on those
+    When I call 'account' on both it should be possible

data/features/step_definitions/account_steps.rb

@@ -19,13 +19,13 @@ end
 
 Then /^the account has (\d+) journals?$/ do |num_journals|
   num_journals = num_journals.to_i
-  
+
   if num_journals == 1
     @journal = @account.journals.first
   else
     @journals = @account.journals
   end
-    
+
   assert_equal num_journals, @account.journals.count
 end
 
@@ -56,7 +56,7 @@ When /^I transfer (\d+) € from global (\w+) account to global (\w+) account$/
   to_account = Account.for(to)
   Journal.current.transfer(amount.to_i, from_account, to_account, @reference, @valuta)
 end
- 
+
 Then /^the balance\-sheet should be:$/ do |table|
   table.hashes.each do |row|
     assert_equal row['Balance'].to_i, User.find_by_name(row['User']).account.balance
@@ -103,7 +103,7 @@ end
 Then /^all postings reference (\w+) with (\w+) (\w+)$/ do |reference_class, name, value|
   reference = reference_class.constantize.find(:first, :conditions => "#{name} = #{value}")
   Posting.all.each do |posting|
-    assert_equal reference, posting.reference 
+    assert_equal reference, posting.reference
   end
 end
 
@@ -121,7 +121,7 @@ end
 
 Then /^(\w+) with (\w+) (\w+) references all postings$/ do |reference_class, name, value|
   reference = reference_class.constantize.find(:first, :conditions => "#{name} = #{value}")
-  assert_equal Posting.all, reference.postings 
+  assert_equal Posting.all, reference.postings
 end
 
 Then /^the order of the postings is correct$/ do
@@ -130,4 +130,19 @@ Then /^the order of the postings is correct$/ do
     assert from.amount < 0
     assert to.amount > 0
   end
+end
+
+Given /^I have the same user in memory$/ do
+  @user1 = User.first
+  @user2 = User.find(@user1.id)
+end
+
+Given /^I disable the account existence check on those$/ do
+  [@user1, @user2].each do |user|
+    user.instance_eval "def default_account ; end"
+  end
+end
+
+When /^I call 'account' on both it should be possible$/ do
+  [@user1, @user2].each { |user| user.account }
 end

data/features/support/env.rb

@@ -1,16 +1,9 @@
-require 'rubygems'
-gem 'mysql'
-gem 'activerecord'
-gem 'actionpack'
-require 'active_record'
-
 require 'test/unit/assertions'
 
 World(Test::Unit::Assertions)
 
-ActiveRecord::Base.establish_connection(YAML.load_file(File.dirname(__FILE__) + '/../../db/database.yml')['acts_as_account'])
-
 require File.dirname(__FILE__) + '/../../lib/acts_as_account'
+ActiveRecord::Base.establish_connection(YAML.load_file(File.dirname(__FILE__) + '/../../db/database.yml')['acts_as_account'])
 
 #ActiveRecord::Base.logger = Logger.new(STDOUT)
 

data/lib/acts_as_account/account.rb

@@ -1,46 +1,46 @@
 module ActsAsAccount
   class Account < ActiveRecord::Base
     set_table_name :acts_as_account_accounts
-    
+
     belongs_to :holder, :polymorphic => true
     has_many :postings
     has_many :journals, :through => :postings
 
-    # TODO: discuss with norman: 
+    # TODO: discuss with norman:
     # validates_presence_of will force an ActiveRecord::find on the object
     # but we have to create accounts for deleted holder!
     #
     # validates_presence_of :holder
-    
+
     class << self
-      
+
       def recalculate_all_balances
         ActsAsAccount::Account.update_all(:balance => 0, :postings_count => 0, :last_valuta => nil)
         sql = <<-EOT
-        SELECT 
-          account_id as id, 
+        SELECT
+          account_id as id,
           count(*) as calculated_postings_count,
           sum(amount) as calculated_balance,
           max(valuta) as calculated_valuta
         FROM
-          acts_as_account_postings 
-        GROUP BY 
-          account_id 
-        HAVING 
+          acts_as_account_postings
+        GROUP BY
+          account_id
+        HAVING
           calculated_postings_count > 0
         EOT
 
         ActsAsAccount::Account.find_by_sql(sql).each do |account|
           account.lock!
           account.update_attributes(
-            :balance => account.calculated_balance, 
+            :balance => account.calculated_balance,
             :postings_count => account.calculated_postings_count,
             :last_valuta => account.calculated_valuta)
 
           puts "account:#{account.id}, balance:#{account.balance}, postings_count:#{account.postings_count}, last_valuta:#{account.last_valuta}"
         end
       end
-      
+
       def for(name)
         GlobalAccount.find_or_create_by_name(name.to_s).account
       end
@@ -50,26 +50,26 @@ module ActsAsAccount
           super
         end
       end
-      
+
       def create(attributes = nil)
         find_on_error(attributes) do
           super
         end
       end
-      
+
       def delete_account(number)
         transaction do
           account = find(number)
           raise ActiveRecord::ActiveRecordError, "Cannot be deleted" unless account.deleteable?
-          
+
           account.holder.destroy if [ManuallyCreatedAccount, GlobalAccount].include?(account.holder.class)
           account.destroy
         end
       end
-      
+
       def find_on_error(attributes)
         yield
-        
+
       # Trying to create a duplicate key on a unique index raises StatementInvalid
       rescue ActiveRecord::StatementInvalid => e
         record = if attributes[:holder]
@@ -80,7 +80,7 @@ module ActsAsAccount
             attributes[:holder_type], attributes[:holder_id], attributes[:name]
           ])
         end
-        record || raise
+        record || raise("Cannot find or create account with attributes #{attributes.inspect}")
       end
     end
 

data/lib/acts_as_account/active_record_extensions.rb

@@ -4,20 +4,20 @@ module ActsAsAccount
       base.extend ClassMethods
       base.class_eval do
         def account(name = :default)
-          __send__("#{name}_account") || __send__("create_#{name}_account", :name => name.to_s) 
+          __send__("#{name}_account") || __send__("create_#{name}_account", :name => name.to_s, :holder_id => self.id, :holder_type => self.class.to_s)
         end
       end
     end
-  
+
     module ClassMethods
-      
+
       def has_account(name = :default)
         has_one "#{name}_account", :conditions => "name = '#{name}'", :class_name => "ActsAsAccount::Account", :as => :holder
         unless instance_methods.include?('accounts')
           has_many :accounts, :class_name => "ActsAsAccount::Account", :as => :holder
         end
       end
-      
+
       def is_reference
         has_many :postings, :class_name => "ActsAsAccount::Posting", :as => :reference
         class_eval <<-EOS

data/lib/acts_as_account/journal.rb

@@ -20,7 +20,7 @@ module ActsAsAccount
     end
     
     def transfers
-      returning([]) do |transfers|
+      [].tap do |transfers|
         postings.in_groups_of(2) { |postings| transfers << Transfer.new(*postings) }
       end
     end
@@ -43,7 +43,8 @@ module ActsAsAccount
       end
     end
     
-    private 
+    private
+    
       def add_posting(amount, account, other_account, reference, valuta)
         posting = postings.build(
           :amount => amount, 
@@ -52,15 +53,9 @@ module ActsAsAccount
           :reference => reference,
           :valuta => valuta)
 
-        account.balance += posting.amount
+        account.reload.balance += posting.amount
         account.postings_count += 1
 
-        # The last valuta will be the most recent date btw this posting valuta (payment.created_at)
-        # and the last valuta.
-        # TODO 2010-05-20 jm: Ask Holger how the last valuta could be more recent than the payment ???
-
-
-        # TODO 2010-05-20 jm: Ask Holger with saving *without* validations ???
         posting.save_without_validation
         account.save_without_validation
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_account
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Thies C. Arntzen, Norman Timmler, Matthias Frick, Phillip Oertel
@@ -15,13 +15,42 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 +01:00
-default_executable: 
+date: 2012-03-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
   name: activerecord
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
+  name: actionpack
+  prerelease: false
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +59,92 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: database_cleaner
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  name: rspec
+  prerelease: false
+  type: :development
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
+  name: jeweler
+  prerelease: false
+  type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 9
+        - 4
+        version: 0.9.4
+  name: cucumber
+  prerelease: false
+  type: :development
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
+        version: 2.7.0
+  name: mysql
+  prerelease: false
+  type: :development
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +153,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: activerecord
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: database_cleaner
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: actionpack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,8 +181,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: database_cleaner
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
+  requirement: *id011
 description: acts_as_account implements double entry accounting for Rails models. Your models get accounts and you can do consistent transactions between them. Since the documentation is sparse, see the transfer.feature for usage examples.
 email: thieso@gmail.com
 executables: []
@@ -71,6 +196,8 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .specification
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -94,13 +221,12 @@ files:
 - lib/acts_as_account/manually_created_account.rb
 - lib/acts_as_account/posting.rb
 - lib/acts_as_account/transfer.rb
-has_rdoc: true
 homepage: http://github.com/betterplace/acts_as_account
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -124,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: acts_as_account implements double entry accounting for Rails models